* [PATCH nft] rule: check for EINTR error from cache_init_objects() for stateful objects
@ 2017-01-23 13:36 Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-01-23 13:36 UTC (permalink / raw)
To: netfilter-devel
Catch -1 case, so we have a chance to handle EINTR.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/rule.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/rule.c b/src/rule.c
index f2ffd4b27e8a..b5181a90f795 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -96,10 +96,9 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd)
list_splice_tail_init(&ctx->list, &table->chains);
if (cmd != CMD_RESET) {
- /* Don't check for errors on listings, this would break
- * nft with old kernels with no stateful object support.
- */
- netlink_list_objs(ctx, &table->handle, &internal_location);
+ ret = netlink_list_objs(ctx, &table->handle, &internal_location);
+ if (ret < 0)
+ return -1;
list_splice_tail_init(&ctx->list, &table->objs);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH nft] rule: check for EINTR error from cache_init_objects() for stateful objects
@ 2017-01-24 18:36 Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-01-24 18:36 UTC (permalink / raw)
To: netfilter-devel
Catch -1 case, so we have a chance to handle EINTR.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
src/rule.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/rule.c b/src/rule.c
index f2ffd4b27e8a..b5181a90f795 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -96,10 +96,9 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd)
list_splice_tail_init(&ctx->list, &table->chains);
if (cmd != CMD_RESET) {
- /* Don't check for errors on listings, this would break
- * nft with old kernels with no stateful object support.
- */
- netlink_list_objs(ctx, &table->handle, &internal_location);
+ ret = netlink_list_objs(ctx, &table->handle, &internal_location);
+ if (ret < 0)
+ return -1;
list_splice_tail_init(&ctx->list, &table->objs);
}
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-24 18:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-23 13:36 [PATCH nft] rule: check for EINTR error from cache_init_objects() for stateful objects Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 18:36 Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).