netfilter: ctnetlink: revert to dumping mark regardless of event type
authorIvan Delalande <colona@arista.com>
Fri, 3 Mar 2023 01:48:31 +0000 (17:48 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2023 07:48:55 +0000 (08:48 +0100)
commitbef8cf77e21ccb1fccffa32ca6a70766e43f82db
tree548fc30568a1dc943ce5ccbb11a45f8be0e37059
parent20fd0607acbf9770db9b99e3418dd75614f80b6c
netfilter: ctnetlink: revert to dumping mark regardless of event type

[ Upstream commit 9f7dd42f0db1dc6915a52d4a8a96ca18dd8cc34e ]

It seems that change was unintentional, we have userspace code that
needs the mark while listening for events like REPLY, DESTROY, etc.
Also include 0-marks in requested dumps, as they were before that fix.

Fixes: 1feeae071507 ("netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark")
Signed-off-by: Ivan Delalande <colona@arista.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_conntrack_netlink.c