Commit 1e98318a authored Sep 20, 2022 by Florian Westphal Committed by Greg Kroah-Hartman Sep 28, 2022

netfilter: ebtables: fix memory leak when blob is malformed



[ Upstream commit 62ce44c4fff947eebdf10bb582267e686e6835c9 ]

The bug fix was incomplete, it "replaced" crash with a memory leak.
The old code had an assignment to "ret" embedded into the conditional,
restore this.

Fixes: 7997eff82828 ("netfilter: ebtables: reject blobs that don't provide all entry points")
Reported-and-tested-by:  <syzbot+a24c5252f3e3ab733464@syzkaller.appspotmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a5d862f3

net/bridge/netfilter/ebtables.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1003,8 +1003,10 @@ static int do_replace_finish(struct net net, struct ebt_replace repl,
		goto free_iterate;
		}

		if (repl->valid_hooks != t->valid_hooks)
		if (repl->valid_hooks != t->valid_hooks) {
		ret = -EINVAL;
		goto free_unlock;
		}

		if (repl->num_counters && repl->num_counters != t->private->nentries) {
		ret = -EINVAL;