diff options
| author | Florian Westphal <fw@strlen.de> | 2022-09-20 14:20:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-28 11:11:52 +0200 |
| commit | d5917b7af7cae0e2804f9d127a03268035098b7f (patch) | |
| tree | 53c03b9115f7a755a11700dd2022d1dff5b96342 /net/bridge | |
| parent | 08d7524f366a886b99b1630a24a27dd6e0d7f852 (diff) | |
| download | linux-stable-d5917b7af7cae0e2804f9d127a03268035098b7f.tar.gz linux-stable-d5917b7af7cae0e2804f9d127a03268035098b7f.tar.bz2 linux-stable-d5917b7af7cae0e2804f9d127a03268035098b7f.zip | |
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>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index 8905fe2fe023..16774559c52c 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -1040,8 +1040,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; |