[PATCH net] macsec: fix UAF bug for real_dev

[PATCH net] macsec: fix UAF bug for real_dev

[Ziyang Xuan]

Create a new macsec device but not get reference to real_dev. That can
not ensure that real_dev is freed after macsec. That will trigger the
UAF bug for real_dev as following:

==================================================================
BUG: KASAN: use-after-free in macsec_get_iflink+0x5f/0x70 drivers/net/macsec.c:3662
Call Trace:
 ...
 macsec_get_iflink+0x5f/0x70 drivers/net/macsec.c:3662
 dev_get_iflink+0x73/0xe0 net/core/dev.c:637
 default_operstate net/core/link_watch.c:42 [inline]
 rfc2863_policy+0x233/0x2d0 net/core/link_watch.c:54
 linkwatch_do_dev+0x2a/0x150 net/core/link_watch.c:161

Allocated by task 22209:
 ...
 alloc_netdev_mqs+0x98/0x1100 net/core/dev.c:10549
 rtnl_create_link+0x9d7/0xc00 net/core/rtnetlink.c:3235
 veth_newlink+0x20e/0xa90 drivers/net/veth.c:1748

Freed by task 8:
 ...
 kfree+0xd6/0x4d0 mm/slub.c:4552
 kvfree+0x42/0x50 mm/util.c:615
 device_release+0x9f/0x240 drivers/base/core.c:2229
 kobject_cleanup lib/kobject.c:673 [inline]
 kobject_release lib/kobject.c:704 [inline]
 kref_put include/linux/kref.h:65 [inline]
 kobject_put+0x1c8/0x540 lib/kobject.c:721
 netdev_run_todo+0x72e/0x10b0 net/core/dev.c:10327

After commit faab39f63c1f ("net: allow out-of-order netdev unregistration")
and commit e5f80fcf869a ("ipv6: give an IPv6 dev to blackhole_netdev"), we
can add dev_hold_track() in macsec_dev_init() and dev_put_track() in
macsec_free_netdev() to fix the problem.

Fixes: 2bce1ebed17d ("macsec: fix refcnt leak in module exit routine")
Reported-by: syzbot+d0e94b65ac259c29ce7a@syzkaller.appspotmail.com
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
---
 drivers/net/macsec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 832f09ac075e..75f85e809a89 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -107,6 +107,7 @@ struct pcpu_secy_stats {
 struct macsec_dev {
 	struct macsec_secy secy;
 	struct net_device *real_dev;
+	netdevice_tracker dev_tracker;
 	struct pcpu_secy_stats __percpu *stats;
 	struct list_head secys;
 	struct gro_cells gro_cells;
@@ -3459,6 +3460,9 @@ static int macsec_dev_init(struct net_device *dev)
 	if (is_zero_ether_addr(dev->broadcast))
 		memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
 
+	/* Get macsec's reference to real_dev */
+	dev_hold_track(real_dev, &macsec->dev_tracker, GFP_KERNEL);
+
 	return 0;
 }
 
@@ -3704,6 +3708,8 @@ static void macsec_free_netdev(struct net_device *dev)
 	free_percpu(macsec->stats);
 	free_percpu(macsec->secy.tx_sc.stats);
 
+	/* Get rid of the macsec's reference to real_dev */
+	dev_put_track(macsec->real_dev, &macsec->dev_tracker);
 }
 
 static void macsec_setup(struct net_device *dev)
-- 
2.25.1

Re: [PATCH net] macsec: fix UAF bug for real_dev

[Jakub Kicinski]

On Sat, 28 May 2022 17:36:59 +0800 Ziyang Xuan wrote:
> --- a/drivers/net/macsec.c
> +++ b/drivers/net/macsec.c
> @@ -107,6 +107,7 @@ struct pcpu_secy_stats {
>  struct macsec_dev {
>  	struct macsec_secy secy;
>  	struct net_device *real_dev;
> +	netdevice_tracker dev_tracker;

You need to add kdoc for @dev_tracker.

Re: [PATCH net] macsec: fix UAF bug for real_dev

[Ziyang Xuan (William)]

> On Sat, 28 May 2022 17:36:59 +0800 Ziyang Xuan wrote:
>> --- a/drivers/net/macsec.c
>> +++ b/drivers/net/macsec.c
>> @@ -107,6 +107,7 @@ struct pcpu_secy_stats {
>>  struct macsec_dev {
>>  	struct macsec_secy secy;
>>  	struct net_device *real_dev;
>> +	netdevice_tracker dev_tracker;
> 
> You need to add kdoc for @dev_tracker.

Yes, it's right. I will give v2 later.

Thank you!
> .
>