Skip to contentSkip to conversation

Patch "macvlan: Fix device ref leak when purging bc_queue" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 30, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

macvlan: Fix device ref leak when purging bc_queue

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
macvlan-fix-device-ref-leak-when-purging-bc_queue.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sun Apr 30 15:46:17 CEST 2017

From: Herbert Xu <[email protected]>
Date: Thu, 20 Apr 2017 20:55:12 +0800
Subject: macvlan: Fix device ref leak when purging bc_queue

From: Herbert Xu <[email protected]>

[ Upstream commit f6478218e6edc2a587b8f132f66373baa7b2497c ]

When a parent macvlan device is destroyed we end up purging its broadcast queue without dropping the device reference count on the packet source device. This causes the source device to linger.

This patch drops that reference count.

Fixes 260916dfb48c ("macvlan: Fix potential use-after free for...")
---
 drivers/net/macvlan.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/macvlan.c +10 -1
@@ -1110,6 +1110,7 @@ static int macvlan_port_create(struct ne
 static void macvlan_port_destroy(struct net_device *dev)
 {
 	struct macvlan_port *port = macvlan_port_get_rtnl(dev);
+	struct sk_buff *skb;
 
 	dev->priv_flags &= ~IFF_MACVLAN_PORT;
 	netdev_rx_handler_unregister(dev);
@@ -1118,7 +1119,15 @@ static void macvlan_port_destroy(struct
 	 * but we need to cancel it and purge left skbs if any.
 	 */
 	cancel_work_sync(&port->bc_work);
-	__skb_queue_purge(&port->bc_queue);
+
+	while ((skb = __skb_dequeue(&port->bc_queue))) {
+		const struct macvlan_dev *src = MACVLAN_SKB_CB(skb)->src;
+
+		if (src)
+			dev_put(src->dev);
+
+		kfree_skb(skb);
+	}
 
 	kfree_rcu(port, rcu);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/macvlan-fix-device-ref-leak-when-purging-bc_queue.patch queue-4.4/crypto-testmgr-fix-out-of-bound-read-in-__test_aead.patch