From: Florian Westphal Date: Tue, 13 Dec 2016 12:59:33 +0000 (+0100) Subject: netfilter: nf_tables: fix oob access X-Git-Tag: v4.1.12-107.0.20170801_2000~21 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5fda1d6d9cabc8aafaf3eb64e47361c5ccc2ec46;p=users%2Fjedix%2Flinux-maple.git netfilter: nf_tables: fix oob access 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 Signed-off-by: Pablo Neira Ayuso (cherry picked from commit 3e38df136e453aa69eb4472108ebce2fb00b1ba6) Orabug: 25960439,26492640,26492632 Signed-off-by: Ethan Zhao --- diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 478d59aa2bdc..dbff384b8c5b 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1922,7 +1922,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); }