diff options
| author | Phil Sutter <phil@nwl.cc> | 2022-09-28 23:26:42 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2022-09-30 16:09:06 +0200 |
| commit | 545edb7a8ef0a8acf991b1b7857fddc24d7b151a (patch) | |
| tree | ad5c041c31728c7a8d6b6ff542d93578ee271a10 | |
| parent | 0f1fbeca73b9dfcf19e04eb5ce4718528c01c2f1 (diff) | |
monitor: Sanitize startup race condition
During startup, 'nft monitor' first fetches the current ruleset and then
keeps this cache up to date based on received events. This is racey, as
any ruleset changes in between the initial fetch and the socket opening
are not recognized.
This script demonstrates the problem:
| #!/bin/bash
|
| while true; do
| nft flush ruleset
| iptables-nft -A FORWARD
| done &
| maniploop=$!
|
| trap "kill $maniploop; kill \$!; wait" EXIT
|
| while true; do
| nft monitor rules >/dev/null &
| sleep 0.2
| kill $!
| done
If the table add event is missed, the rule add event callback fails to
deserialize the rule and calls abort().
Avoid the inconvenient program exit by returning NULL from
netlink_delinearize_rule() instead of aborting and make callers check
the return value.
Signed-off-by: Phil Sutter <phil@nwl.cc>
| -rw-r--r-- | src/cache.c | 1 | ||||
| -rw-r--r-- | src/monitor.c | 5 | ||||
| -rw-r--r-- | src/netlink_delinearize.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/cache.c b/src/cache.c index f790f995..85de970f 100644 --- a/src/cache.c +++ b/src/cache.c @@ -598,6 +598,7 @@ static int list_rule_cb(struct nftnl_rule *nlr, void *data) netlink_dump_rule(nlr, ctx); rule = netlink_delinearize_rule(ctx, nlr); + assert(rule); list_add_tail(&rule->list, &ctx->list); return 0; diff --git a/src/monitor.c b/src/monitor.c index 7fa92ebf..a6b30a18 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -551,6 +551,10 @@ static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type, nlr = netlink_rule_alloc(nlh); r = netlink_delinearize_rule(monh->ctx, nlr); + if (!r) { + fprintf(stderr, "W: Received event for an unknown table.\n"); + goto out_free_nlr; + } nlr_for_each_set(nlr, rule_map_decompose_cb, NULL, &monh->ctx->nft->cache); cmd = netlink_msg2cmd(type, nlh->nlmsg_flags); @@ -587,6 +591,7 @@ static int netlink_events_rule_cb(const struct nlmsghdr *nlh, int type, break; } rule_free(r); +out_free_nlr: nftnl_rule_free(nlr); return MNL_CB_OK; } diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 0da6cc78..e8b9724c 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -3195,7 +3195,10 @@ struct rule *netlink_delinearize_rule(struct netlink_ctx *ctx, pctx->rule = rule_alloc(&netlink_location, &h); pctx->table = table_cache_find(&ctx->nft->cache.table_cache, h.table.name, h.family); - assert(pctx->table != NULL); + if (!pctx->table) { + errno = ENOENT; + return NULL; + } pctx->rule->comment = nftnl_rule_get_comment(nlr); |