From: Florian Westphal Date: Thu, 11 Jan 2018 15:30:21 +0000 (+0100) Subject: src: netlink_delinearize: don't assume element contains a value X-Git-Tag: v0.8.4~84 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=468ad4be967842dff88e220c17c7e4bcc5c8193b;p=thirdparty%2Fnftables.git src: netlink_delinearize: don't assume element contains a value We cannot assume i->key->key is EXPR_VALUE, we could look e.g. at a range, which will trigger an assertion failure in binop_adjust_one(). We should call __binop_adjust recursively again in the EXPR_SET_ELEM case, using key as new input. Fixes: b8b8e7b6ae10 ("evaluate: transfer right shifts to set reference side") Signed-off-by: Florian Westphal --- diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 997fb53b..b20047f1 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1648,7 +1648,7 @@ static void __binop_adjust(const struct expr *binop, struct expr *right, binop_adjust_one(binop, i->key->right, shift); break; case EXPR_SET_ELEM: - binop_adjust_one(binop, i->key->key, shift); + __binop_adjust(binop, i->key->key, shift); break; default: BUG("unknown expression type %s\n", i->key->ops->name);