Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7dc13d6 authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: ebtables: CONFIG_COMPAT: drop a bogus WARN_ON 



commit 7caa56f006e9d712b44f27b32520c66420d5cbc6 upstream.

It means userspace gave us a ruleset where there is some other
data after the ebtables target but before the beginning of the next rule.

Fixes: 81e675c2 ("netfilter: ebtables: add CONFIG_COMPAT support")
Reported-by: default avatar <syzbot+659574e7bcc7f7eb4df7@syzkaller.appspotmail.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 94ad68a6

net/bridge/netfilter/ebtables.c

+2 −1
Original line number Diff line number Diff line
@@ -2032,7 +2032,8 @@ static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32, 
		if (match_kern)

			match_kern->match_size = ret;



		if (WARN_ON(type == EBT_COMPAT_TARGET && size_left))

		/* rule should have no remaining data after target */

		if (type == EBT_COMPAT_TARGET && size_left)

			return -EINVAL;



		match32 = (struct compat_ebt_entry_mwt *) buf;