diff options
author | Florian Westphal <fw@strlen.de> | 2016-12-13 13:59:33 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 08:35:55 +0000 |
commit | e72ebbefe1b222336bd11de0671f0d7ce76e1c6e (patch) | |
tree | 0beefbfcc7022d900b1db0971e30f66cda2bb9a6 | |
parent | f243d9f3f4a0286a8c3071adbc6e42f93a6450a3 (diff) | |
download | linux-stable-e72ebbefe1b222336bd11de0671f0d7ce76e1c6e.tar.gz linux-stable-e72ebbefe1b222336bd11de0671f0d7ce76e1c6e.tar.bz2 linux-stable-e72ebbefe1b222336bd11de0671f0d7ce76e1c6e.zip |
netfilter: nf_tables: fix oob access
[ Upstream commit 3e38df136e453aa69eb4472108ebce2fb00b1ba6 ]
BUG: KASAN: slab-out-of-bounds in nf_tables_rule_destroy+0xf1/0x130 at addr ffff88006a4c35c8
Read of size 8 by task nft/1607
When we've destroyed last valid expr, nft_expr_next() returns an invalid expr.
We must not dereference it unless it passes != nft_expr_last() check.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | net/netfilter/nf_tables_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 9fe2baa01fbe..74724560bc48 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1869,7 +1869,7 @@ static void nf_tables_rule_destroy(const struct nft_ctx *ctx, * is called on error from nf_tables_newrule(). */ expr = nft_expr_first(rule); - while (expr->ops && expr != nft_expr_last(rule)) { + while (expr != nft_expr_last(rule) && expr->ops) { nf_tables_expr_destroy(ctx, expr); expr = nft_expr_next(expr); } |