diff options
author | Patrick McHardy <kaber@trash.net> | 2010-01-26 11:04:02 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-01-26 11:04:02 -0500 |
commit | e578756c35859a459d78d8416195bc5f5ff897d0 (patch) | |
tree | 15e0212370688d26b9ee7fea93957f726044db84 | |
parent | 135d01899b1fba17045961febff7e5141db6048f (diff) |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 59d8064eb522..42f21c01a93e 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, | |||
1437 | struct nlattr *nest_parms; | 1437 | struct nlattr *nest_parms; |
1438 | 1438 | ||
1439 | memset(&m, 0xFF, sizeof(m)); | 1439 | memset(&m, 0xFF, sizeof(m)); |
1440 | m.src.u.all = mask->src.u.all; | ||
1441 | memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3)); | 1440 | memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3)); |
1441 | m.src.u.all = mask->src.u.all; | ||
1442 | m.dst.protonum = tuple->dst.protonum; | ||
1442 | 1443 | ||
1443 | nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED); | 1444 | nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK | NLA_F_NESTED); |
1444 | if (!nest_parms) | 1445 | if (!nest_parms) |