diff options
| author | Florian Westphal <fw@strlen.de> | 2018-03-08 12:54:19 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-06-16 22:21:30 +0100 |
| commit | 68edcec690a62dfc46c4061dab83c08573427e6b (patch) | |
| tree | 2e3ba68633db9be715da2e951c57845daef5c7e6 /net | |
| parent | 71a00fe67dde7d2ed206a0db2a67f29fad90cc72 (diff) | |
| download | linux-stable-68edcec690a62dfc46c4061dab83c08573427e6b.tar.gz linux-stable-68edcec690a62dfc46c4061dab83c08573427e6b.tar.bz2 linux-stable-68edcec690a62dfc46c4061dab83c08573427e6b.zip | |
netfilter: ebtables: fix erroneous reject of last rule
commit 932909d9b28d27e807ff8eecb68c7748f6701628 upstream.
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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/netfilter/ebtables.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index dcfc3f5c18a8..72142370bd98 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c @@ -2070,8 +2070,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]) |