mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
netfilter: ctnetlink: fix dump of the expect mask attribute
[ Upstream commitb58f33d49e
] Before this change, the mask is never included in the netlink message, so "conntrack -E expect" always prints 0.0.0.0. In older kernels the l3num callback struct was passed as argument, based on tuple->src.l3num. After the l3num indirection got removed, the call chain is based on m.src.l3num, but this value is 0xffff. Init l3num to the correct value. Fixes:f957be9d34
("netfilter: conntrack: remove ctnetlink callbacks from l3 protocol trackers") Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
c4dd0b36cc
commit
67319a8df5
1 changed files with 1 additions and 0 deletions
|
@ -2680,6 +2680,7 @@ static int ctnetlink_exp_dump_mask(struct sk_buff *skb,
|
|||
memset(&m, 0xFF, sizeof(m));
|
||||
memcpy(&m.src.u3, &mask->src.u3, sizeof(m.src.u3));
|
||||
m.src.u.all = mask->src.u.all;
|
||||
m.src.l3num = tuple->src.l3num;
|
||||
m.dst.protonum = tuple->dst.protonum;
|
||||
|
||||
nest_parms = nla_nest_start(skb, CTA_EXPECT_MASK);
|
||||
|
|
Loading…
Reference in a new issue