提交 1ed9887e 编写于 作者: G Gao Feng 提交者: Pablo Neira Ayuso

netfilter: xt_multiport: Fix wrong unmatch result with multiple ports

I lost one test case in the last commit for xt_multiport.
For example, the rule is "-m multiport --dports 22,80,443".
When first port is unmatched and the second is matched, the curent codes
could not return the right result.
It would return false directly when the first port is unmatched.

Fixes: dd2602d0 ("netfilter: xt_multiport: Use switch case instead
of multiple condition checks")
Signed-off-by: NGao Feng <fgao@ikuai8.com>
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
上级 18140969
......@@ -44,12 +44,18 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
switch (minfo->flags) {
case XT_MULTIPORT_SOURCE:
return (src >= s && src <= e) ^ minfo->invert;
if (src >= s && src <= e)
return true ^ minfo->invert;
break;
case XT_MULTIPORT_DESTINATION:
return (dst >= s && dst <= e) ^ minfo->invert;
if (dst >= s && dst <= e)
return true ^ minfo->invert;
break;
case XT_MULTIPORT_EITHER:
return ((dst >= s && dst <= e) ||
(src >= s && src <= e)) ^ minfo->invert;
if ((dst >= s && dst <= e) ||
(src >= s && src <= e))
return true ^ minfo->invert;
break;
default:
break;
}
......@@ -59,11 +65,17 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
switch (minfo->flags) {
case XT_MULTIPORT_SOURCE:
return (src == s) ^ minfo->invert;
if (src == s)
return true ^ minfo->invert;
break;
case XT_MULTIPORT_DESTINATION:
return (dst == s) ^ minfo->invert;
if (dst == s)
return true ^ minfo->invert;
break;
case XT_MULTIPORT_EITHER:
return (src == s || dst == s) ^ minfo->invert;
if (src == s || dst == s)
return true ^ minfo->invert;
break;
default:
break;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册