提交 932909d9 编写于 作者: F Florian Westphal 提交者: Pablo Neira Ayuso

netfilter: ebtables: fix erroneous reject of last rule

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: b7181216 ("netfilter: ebtables: CONFIG_COMPAT: don't trust userland offsets")
Signed-off-by: NFlorian Westphal <fw@strlen.de>
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
上级 0d3601d2
...@@ -2119,8 +2119,12 @@ static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base, ...@@ -2119,8 +2119,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). * offsets are relative to beginning of struct ebt_entry (i.e., 0).
*/ */
for (i = 0; i < 4 ; ++i) { for (i = 0; i < 4 ; ++i) {
if (offsets[i] >= *total) if (offsets[i] > *total)
return -EINVAL; return -EINVAL;
if (i < 3 && offsets[i] == *total)
return -EINVAL;
if (i == 0) if (i == 0)
continue; continue;
if (offsets[i-1] > offsets[i]) if (offsets[i-1] > offsets[i])
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册