tap_get_tap_dev() takes a reference on tap->dev, released by tap_put_tap_dev(). This comes from commit 8f475a318aaa ("macvtap: introduce macvtap_get_vlan()"), when q->vlan was read under rcu_read_lock_bh() and the reference was needed to use the device after rcu_read_unlock_bh(). Both remaining callers, SIOCGIFHWADDR and SIOCSIFHWADDR, hold RTNL for the whole time the device is used. tap_del_queues() clears q->tap under RTNL, before the device can be freed, so a non NULL q->tap guarantees the device stays around until rtnl_unlock(). TUNSETOFFLOAD already relies on this. Use rtnl_dereference(q->tap) directly. Signed-off-by: Eric Dumazet --- drivers/net/tap.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index a240609d2a8a6b643216135d4b80540c18cf11db..2d6af83d97b38e5dd9137c02e5bf002a1d12f678 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -866,23 +866,6 @@ static ssize_t tap_read_iter(struct kiocb *iocb, struct iov_iter *to) return ret; } -static struct tap_dev *tap_get_tap_dev(struct tap_queue *q) -{ - struct tap_dev *tap; - - ASSERT_RTNL(); - tap = rtnl_dereference(q->tap); - if (tap) - dev_hold(tap->dev); - - return tap; -} - -static void tap_put_tap_dev(struct tap_dev *tap) -{ - dev_put(tap->dev); -} - static int tap_ioctl_set_queue(struct file *file, unsigned int flags) { struct tap_queue *q = file->private_data; @@ -1040,7 +1023,7 @@ static long tap_ioctl(struct file *file, unsigned int cmd, case SIOCGIFHWADDR: rtnl_lock(); - tap = tap_get_tap_dev(q); + tap = rtnl_dereference(q->tap); if (!tap) { rtnl_unlock(); return -ENOLINK; @@ -1051,7 +1034,6 @@ static long tap_ioctl(struct file *file, unsigned int cmd, if (copy_to_user(&ifr->ifr_name, tap->dev->name, IFNAMSIZ) || copy_to_user(&ifr->ifr_hwaddr, &ss, sizeof(ifr->ifr_hwaddr))) ret = -EFAULT; - tap_put_tap_dev(tap); rtnl_unlock(); return ret; @@ -1059,7 +1041,7 @@ static long tap_ioctl(struct file *file, unsigned int cmd, if (copy_from_user(&ss, &ifr->ifr_hwaddr, sizeof(ifr->ifr_hwaddr))) return -EFAULT; rtnl_lock(); - tap = tap_get_tap_dev(q); + tap = rtnl_dereference(q->tap); if (!tap) { rtnl_unlock(); return -ENOLINK; @@ -1068,7 +1050,6 @@ static long tap_ioctl(struct file *file, unsigned int cmd, ret = -EINVAL; else ret = dev_set_mac_address_user(tap->dev, &ss, NULL); - tap_put_tap_dev(tap); rtnl_unlock(); return ret; -- 2.53.0