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

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

netfilter: ebtables: fix erroneous reject of last rule 



[ Upstream commit 932909d9b28d27e807ff8eecb68c7748f6701628 ]

The last rule in the blob has next_entry offset that is same as total size.
This made "ebtables32 -A OUTPUT -d de:ad:be:ef:01:02" fail on 64 bit kernel.

Fixes: b71812168571fa ("netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2299285f

net/bridge/netfilter/ebtables.c

+5 −1
Original line number Diff line number Diff line
@@ -2124,8 +2124,12 @@ static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base, 
	 * offsets are relative to beginning of struct ebt_entry (i.e., 0).

	 */

	for (i = 0; i < 4 ; ++i) {

		if (offsets[i] >= *total)

		if (offsets[i] > *total)

			return -EINVAL;



		if (i < 3 && offsets[i] == *total)

			return -EINVAL;



		if (i == 0)

			continue;

		if (offsets[i-1] > offsets[i])