diff options
author | Patrick McHardy <kaber@trash.net> | 2010-01-26 17:04:02 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-01-26 17:04:02 +0100 |
commit | e578756c35859a459d78d8416195bc5f5ff897d0 (patch) | |
tree | 15e0212370688d26b9ee7fea93957f726044db84 /net | |
parent | 135d01899b1fba17045961febff7e5141db6048f (diff) | |
download | linux-3.10-e578756c35859a459d78d8416195bc5f5ff897d0.tar.gz linux-3.10-e578756c35859a459d78d8416195bc5f5ff897d0.tar.bz2 linux-3.10-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>
Diffstat (limited to '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 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) |