Florian Westphal 797a7d66d2 netfilter: ctnetlink: send event when conntrack label was modified ... commit 0ceabd8387 (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 9b21f6a909 (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>		2013-06-24 11:32:56 +02:00
..
9p	Lots of virtio work which wasn't quite ready for last merge window. Plus	2013-05-02 14:14:04 -07:00
802	net/802/mrp: fix lockdep splat	2013-05-14 13:02:30 -07:00
8021q	net: vlan,ethtool: netdev_features_t is more than 32 bit	2013-05-02 13:58:12 -04:00
appletalk	appletalk: info leak in ->getname()	2013-04-25 01:47:58 -04:00
atm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ax25	ax25: fix info leak via msg_name in ax25_recvmsg()	2013-04-07 16:28:00 -04:00
batman-adv	batman-adv: Avoid double freeing of bat_counters	2013-05-21 21:34:36 +02:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
bridge	netfilter: log: netns NULL ptr bug when calling from conntrack	2013-05-15 14:11:07 +02:00
caif	caif: Remove bouncing address for Daniel Martensson	2013-04-23 13:25:51 -04:00
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ceph	libceph: init sent and completed when starting	2013-05-13 12:52:23 -05:00
core	net: fix sk_buff head without data area	2013-06-04 17:26:49 -07:00
dcb	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
dccp	tcp: Remove TCPCT	2013-03-17 14:35:13 -04:00
decnet	decnet: remove duplicated include from dn_table.c	2013-04-07 17:12:01 -04:00
dns_resolver	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-12-16 15:40:50 -08:00
dsa	dsa: fix freeing of sparse port allocation	2013-03-25 12:23:41 -04:00
ethernet	net: add ETH_P_802_3_MIN	2013-03-28 01:20:42 -04:00
ieee802154	ieee802154/nl-mac.c: make some MLME operations optional	2013-04-08 12:00:16 -04:00
ipv4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2013-05-30 16:38:38 -07:00
ipv6	netfilter: nf_conntrack_ipv6: Plug sk_buff leak in fragment handling	2013-06-20 12:01:24 +02:00
ipx	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
irda	net: irda: using kzalloc() instead of kmalloc() to avoid strncpy() issue.	2013-05-19 15:10:47 -07:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
key	xfrm: force a garbage collection after deleting a policy	2013-05-31 17:30:07 -07:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-07 18:37:01 -04:00
lapb	net/lapb: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:01 -08:00
llc	llc: Fix missing msg_namelen update in llc_ui_recvmsg()	2013-04-07 16:28:01 -04:00
mac80211	mac80211: Allow single vif mac address change with addr_mask	2013-05-27 11:26:48 +02:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
netfilter	netfilter: ctnetlink: send event when conntrack label was modified	2013-06-24 11:32:56 +02:00
netlabel	netlabel: improve domain mapping validation	2013-05-19 14:49:55 -07:00
netlink	net: fix sk_buff head without data area	2013-06-04 17:26:49 -07:00
netrom	netrom: info leak in ->getname()	2013-04-25 01:47:58 -04:00
nfc	NFC: Remove commented out LLCP related Makefile line	2013-05-21 10:47:41 +02:00
openvswitch	openvswitch: Remove unneeded ovs_netdev_get_ifindex()	2013-04-30 00:19:11 -04:00
packet	packet: tpacket_v3: do not trigger bug() on wrong header status	2013-05-03 16:10:33 -04:00
phonet	rtnetlink: Remove passing of attributes into rtnl_doit functions	2013-03-22 10:31:16 -04:00
rds	net/rds: zero last byte for strncpy	2013-03-08 00:35:44 -05:00
rfkill	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-04-22 14:58:14 -04:00
rose	rose: fix info leak via msg_name in rose_recvmsg()	2013-04-07 16:28:02 -04:00
rxrpc	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
sched	net_sched: htb: do not mix 1ns and 64ns time units	2013-06-04 17:44:07 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
sunrpc	Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux	2013-05-10 09:28:55 -07:00
tipc	tipc: potential divide by zero in tipc_link_recv_fragment()	2013-05-06 16:16:52 -04:00
unix	af_unix: fix a fatal race with bit fields	2013-05-01 15:13:49 -04:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
wimax
wireless	cfg80211: fix reporting 64-bit station info tx bytes	2013-05-23 22:08:18 +02:00
x25	x25: use proc_remove_subtree()	2013-04-09 14:13:35 -04:00
xfrm	xfrm: force a garbage collection after deleting a policy	2013-05-31 17:30:07 -07:00
compat.c
Kconfig	netlink: kconfig: move mmap i/o into netlink kconfig	2013-05-01 15:02:42 -04:00
Makefile	VSOCK: Introduce VM Sockets	2013-02-10 19:41:08 -05:00
nonet.c
socket.c	net: Block MSG_CMSG_COMPAT in send(m)msg and recv(m)msg	2013-05-28 23:55:41 -07:00
sysctl_net.c	user_ns: get rid of duplicate code in net_ctl_permissions	2012-11-18 20:32:45 -05:00