aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-01-26 17:04:02 +0100
committerPatrick McHardy <kaber@trash.net>2010-01-26 17:04:02 +0100
commite578756c35859a459d78d8416195bc5f5ff897d0 (patch)
tree15e0212370688d26b9ee7fea93957f726044db84
parent135d01899b1fba17045961febff7e5141db6048f (diff)
downloadmrst-s0i3-test-e578756c35859a459d78d8416195bc5f5ff897d0.tar.gz
mrst-s0i3-test-e578756c35859a459d78d8416195bc5f5ff897d0.tar.xz
mrst-s0i3-test-e578756c35859a459d78d8416195bc5f5ff897d0.zip
netfilter: ctnetlink: fix expectation mask dump
The protocol number is not initialized, so userspace can't interpret the layer 4 data properly. Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--net/netfilter/nf_conntrack_netlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 59d8064eb52..42f21c01a93 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1437,8 +1437,9 @@ ctnetlink_exp_dump_mask(struct sk_buff *skb,
struct nlattr *nest_parms;
memset(&m, 0xFF, sizeof(m));
- m.src.u.all = mask->src.u.all;
memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));
+ m.src.u.all = mask->src.u.all;
+ m.dst.protonum = tuple->dst.protonum;
nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED);
if (!nest_parms)