提交 0efe125c 编写于 作者: D David Leadbeater 提交者: Pablo Neira Ayuso

netfilter: nf_conntrack_irc: Fix forged IP logic

Ensure the match happens in the right direction, previously the
destination used was the server, not the NAT host, as the comment
shows the code intended.

Additionally nf_nat_irc uses port 0 as a signal and there's no valid way
it can appear in a DCC message, so consider port 0 also forged.

Fixes: 869f37d8 ("[NETFILTER]: nf_conntrack/nf_nat: add IRC helper port")
Signed-off-by: NDavid Leadbeater <dgl@dgl.cx>
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
上级 77972a36
...@@ -194,8 +194,9 @@ static int help(struct sk_buff *skb, unsigned int protoff, ...@@ -194,8 +194,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,
/* dcc_ip can be the internal OR external (NAT'ed) IP */ /* dcc_ip can be the internal OR external (NAT'ed) IP */
tuple = &ct->tuplehash[dir].tuple; tuple = &ct->tuplehash[dir].tuple;
if (tuple->src.u3.ip != dcc_ip && if ((tuple->src.u3.ip != dcc_ip &&
tuple->dst.u3.ip != dcc_ip) { ct->tuplehash[!dir].tuple.dst.u3.ip != dcc_ip) ||
dcc_port == 0) {
net_warn_ratelimited("Forged DCC command from %pI4: %pI4:%u\n", net_warn_ratelimited("Forged DCC command from %pI4: %pI4:%u\n",
&tuple->src.u3.ip, &tuple->src.u3.ip,
&dcc_ip, dcc_port); &dcc_ip, dcc_port);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册