summaryrefslogtreecommitdiffstats
path: root/src/rule.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2021-03-02 12:35:20 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2021-03-05 20:42:14 +0100
commit2cf79802834cf143dffb3d6a8044e1e11419e8ec (patch)
tree7542609dc7f37f34ced29546d07c0198877bf99c /src/rule.c
parent6d085b22a8b5165406b5727ccf21a91ac5b97136 (diff)
mnl: remove nft_mnl_socket_reopen()
nft_mnl_socket_reopen() was introduced to deal with the EINTR case. By reopening the netlink socket, pending netlink messages that are part of a stale netlink dump are implicitly drop. This patch replaces the nft_mnl_socket_reopen() strategy by pulling out all of the remaining netlink message to restart in a clean state. This is implicitly fixing up a bug in the table ownership support, which assumes that the netlink socket remains open until nft_ctx_free() is invoked. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r--src/rule.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rule.c b/src/rule.c
index acb10f65..367c5c8b 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -292,10 +292,9 @@ replay:
ret = cache_init(&ctx, flags);
if (ret < 0) {
cache_release(cache);
- if (errno == EINTR) {
- nft->nf_sock = nft_mnl_socket_reopen(nft->nf_sock);
+ if (errno == EINTR)
goto replay;
- }
+
return -1;
}