netfilter: ctnetlink: send event when conntrack label was modified
authorFlorian Westphal <fw@strlen.de>
Fri, 21 Jun 2013 14:51:30 +0000 (16:51 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 24 Jun 2013 09:32:56 +0000 (11:32 +0200)
commit797a7d66d2048fe8a4ac1ba58c5d4752d64b1ac4
tree7daf7f21006ae948b6ae1cb82426e7e35ec29b4f
parent5aed93875cd88502f04a0d4517b8a2d89a849773
netfilter: ctnetlink: send event when conntrack label was modified

commit 0ceabd83875b72a29f33db4ab703d6ba40ea4c58
(netfilter: ctnetlink: deliver labels to userspace) sets the event bit
when we raced with another packet, instead of raising the event bit
when the label bit is set for the first time.

commit 9b21f6a90924dfe8e5e686c314ddb441fb06501e
(netfilter: ctnetlink: allow userspace to modify labels) forgot to update
the event mask in the "conntrack already exists" case.

Both issues result in CTA_LABELS attribute not getting included in the
conntrack event.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nf_conntrack_labels.c
net/netfilter/nf_conntrack_netlink.c