net: macvlan: fix potential UAF problem for lowerdev
Subsystems (2)
cover net: macvlan: fix potential UAF problem for lowerdev
Add the reference operation to lowerdev of macvlan to avoid the potential UAF problem under the following known scenario:
Someone module puts the NETDEV_UNREGISTER event handler to a work, and lowerdev is accessed in the work handler. But when the work is excuted, lowerdev has been destroyed because upper macvlan did not get reference to lowerdev correctly.
In addition, add net device refcount tracker to macvlan.
Ziyang Xuan (2):
net: macvlan: fix potential UAF problem for lowerdev
net: macvlan: add net device refcount tracker
drivers/net/macvlan.c | 14 +++++++++++++- include/linux/if_macvlan.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-)
Signature · 1 line
2.25.1
PATCH 1/2 net: macvlan: fix potential UAF problem for lowerdev
Add the reference operation to lowerdev of macvlan to avoid the potential UAF problem under the following known scenario:
Someone module puts the NETDEV_UNREGISTER event handler to a work, and lowerdev is accessed in the work handler. But when the work is excuted, lowerdev has been destroyed because upper macvlan did not get reference to lowerdev correctly.
That likes as the scenario occurred by
commit 563bcbae3ba2 ("net: vlan: fix a UAF in vlan_dev_real_dev()").
--- drivers/net/macvlan.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
drivers/net/macvlan.c +13 -1
@@ -889,7 +889,7 @@ static void macvlan_set_lockdep_class(struct net_device *dev)static int macvlan_init (struct net_device *dev) {struct macvlan_dev *vlan =netdev_priv (dev); -const struct net_device *lowerdev = vlan->lowerdev; +struct net_device *lowerdev = vlan->lowerdev;struct macvlan_port *port = vlan->port; dev->state = (dev->state & ~MACVLAN_STATE_MASK) |
@@ -911,6 +911,9 @@ static int macvlan_init(struct net_device *dev) port->count +=1 ; +/* Get macvlan's reference to lowerdev */ +dev_hold (lowerdev); +return 0 ; }
@@ -1173,6 +1176,14 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_features_check = passthru_features_check, }; +static void macvlan_dev_free (struct net_device *dev) +{ +struct macvlan_dev *vlan =netdev_priv (dev); + +/* Get rid of the macvlan's reference to lowerdev */ +dev_put (vlan->lowerdev); +} +void macvlan_common_setup (struct net_device *dev) {ether_setup (dev);
@@ -1184,6 +1195,7 @@ void macvlan_common_setup(struct net_device *dev) dev->priv_flags |=IFF_UNICAST_FLT |IFF_CHANGE_PROTO_DOWN ; dev->netdev_ops = &macvlan_netdev_ops; dev->needs_free_netdev = true; + dev->priv_destructor = macvlan_dev_free; dev->header_ops = &macvlan_hard_header_ops; dev->ethtool_ops = &macvlan_ethtool_ops; }
Signature · 1 line
2.25.1
PATCH 2/2 net: macvlan: add net device refcount tracker
In reply to Ziyang XuanAdd net device refcount tracker to macvlan.
--- drivers/net/macvlan.c | 4 ++-- include/linux/if_macvlan.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/macvlan.c +2 -2
@@ -912,7 +912,7 @@ static int macvlan_init(struct net_device *dev) port->count +=1 ;/* Get macvlan's reference to lowerdev */ -dev_hold (lowerdev); +dev_hold_track (lowerdev, &vlan->dev_tracker,GFP_KERNEL );return 0 ; }
@@ -1181,7 +1181,7 @@ static void macvlan_dev_free(struct net_device *dev)struct macvlan_dev *vlan =netdev_priv (dev);/* Get rid of the macvlan's reference to lowerdev */ -dev_put (vlan->lowerdev); +dev_put_track (vlan->lowerdev, &vlan->dev_tracker); }void macvlan_common_setup (struct net_device *dev)
include/linux/if_macvlan.h +1 -0
@@ -21,6 +21,7 @@ struct macvlan_dev {struct hlist_node hlist;struct macvlan_port *port;struct net_device *lowerdev; +netdevice_tracker dev_tracker;void *accel_priv;struct vlan_pcpu_stats __percpu *pcpu_stats;
Signature · 1 line
2.25.1
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 9 lines · On Fri, 11 Mar 2022 17:02:41 +0800 you wrote:
Add the reference operation to lowerdev of macvlan to avoid the potential UAF problem under the following known scenario:
Someone module puts the
NETDEV_UNREGISTERevent handler to a work, and lowerdev is accessed in the work handler. But when the work is excuted, lowerdev has been destroyed because upper macvlan did not get reference to lowerdev correctly.[...]
Here is the summary with links:
- [net-next,1/2] net: macvlan: fix potential UAF problem for lowerdev
https://git.kernel.org/netdev/net-next/c/291ac68478d9 - [net-next,2/2] net: macvlan: add net device refcount tracker https://git.kernel.org/netdev/net-next/c/1f4a5983d623
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html