Commit 6d93003e authored by Florian Westphal's avatar Florian Westphal Committed by Zheng Zengkai
Browse files

netfilter: ctnetlink: fix dump of the expect mask attribute 



stable inclusion
from stable-5.10.27
commit ee39ee5f437c1741cb9d1bde5b1aace11de50cb0
bugzilla: 51493

--------------------------------

[ Upstream commit b58f33d4 ]

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: f957be9d ("netfilter: conntrack: remove ctnetlink callbacks from l3 protocol trackers")
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 6601abf5

net/netfilter/nf_conntrack_netlink.c

+1 −0
Original line number Diff line number Diff line
@@ -2960,6 +2960,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);