Commit 58ad436f authored Aug 13, 2013 by Johannes Berg Committed by David S. Miller Aug 13, 2013

genetlink: fix family dump race



When dumping generic netlink families, only the first dump call
is locked with genl_lock(), which protects the list of families,
and thus subsequent calls can access the data without locking,
racing against family addition/removal. This can cause a crash.
Fix it - the locking needs to be conditional because the first
time around it's already locked.

A similar bug was reported to me on an old kernel (3.4.47) but
the exact scenario that happened there is no longer possible,
on those kernels the first round wasn't locked either. Looking
at the current code I found the race described above, which had
also existed on the old kernel.

Cc: stable@vger.kernel.org
Reported-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 771085d6

net/netlink/genetlink.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -789,6 +789,10 @@ static int ctrl_dumpfamily(struct sk_buff skb, struct netlink_callback cb)
		struct net *net = sock_net(skb->sk);
		int chains_to_skip = cb->args[0];
		int fams_to_skip = cb->args[1];
		bool need_locking = chains_to_skip \|\| fams_to_skip;

		if (need_locking)
		genl_lock();

		for (i = chains_to_skip; i < GENL_FAM_TAB_SIZE; i++) {
		n = 0;
		@@ -810,6 +814,9 @@ static int ctrl_dumpfamily(struct sk_buff skb, struct netlink_callback cb)
		cb->args[0] = i;
		cb->args[1] = n;

		if (need_locking)
		genl_unlock();

		return skb->len;
		}