Ivan Delalande <colona@xxxxxxxxxx> wrote:
> I assume that change was unintentional, we have userspace code that
> needs the mark while listening for events like REPLY, DESTROY, etc.
>
> Cc: <stable@xxxxxxxxxxxxxxx>
> Fixes: 1feeae071507 ("netfilter: ctnetlink: fix compilation warning after data race fixes in ct mark")
> Signed-off-by: Ivan Delalande <colona@xxxxxxxxxx>
> ---
> net/netfilter/nf_conntrack_netlink.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
> index c11dff91d52d..194822f8f1ee 100644
> --- a/net/netfilter/nf_conntrack_netlink.c
> +++ b/net/netfilter/nf_conntrack_netlink.c
> @@ -831,7 +831,7 @@ ctnetlink_conntrack_event(unsigned int events, const struct nf_ct_event *item)
> }
>
> #ifdef CONFIG_NF_CONNTRACK_MARK
> - if (events & (1 << IPCT_MARK) &&
> + if ((events & (1 << IPCT_MARK) || READ_ONCE(ct->mark)) &&
> ctnetlink_dump_mark(skb, ct) < 0)
> goto nla_put_failure;
Probably better to just drop the event bit test?
if (ctnetlink_dump_mark(skb, ct) < 0)
goto nla_put_failure;
