summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorHarald Welte <laforge@netfilter.org>2005-08-10 05:03:22 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-30 00:39:10 +0200
commitbd9a26b7f2ee7567571bb5b7acc1a256c544a0dd (patch)
treefd17d11fbbedf67f6e5edde8ce76d18a3f6230f2 /net/ipv4
parent[NETFILTER]: conntrack_netlink: Fix locking during conntrack_create (diff)
downloadlinux-bd9a26b7f2ee7567571bb5b7acc1a256c544a0dd.tar.xz
linux-bd9a26b7f2ee7567571bb5b7acc1a256c544a0dd.zip
[NETFILTER]: fix ctnetlink 'create_expect' parsing
There was a stupid copy+paste mistake where we parse the MASK nfattr into the "tuple" variable instead of the "mask" variable. This patch fixes it. Thanks to Pablo Neira. Signed-off-by: Harald Welte <laforge@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/netfilter/ip_conntrack_netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c
index 0ab2d7df6bc4..23f18f6a5535 100644
--- a/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -1388,7 +1388,7 @@ ctnetlink_create_expect(struct nfattr *cda[])
err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_TUPLE);
if (err < 0)
return err;
- err = ctnetlink_parse_tuple(cda, &tuple, CTA_EXPECT_MASK);
+ err = ctnetlink_parse_tuple(cda, &mask, CTA_EXPECT_MASK);
if (err < 0)
return err;