Skip to content

Commit 3e881d8

Browse files
congwanggregkh
authored andcommitted
ax25: fix a use-after-free in ax25_fillin_cb()
[ Upstream commit c433570 ] There are multiple issues here: 1. After freeing dev->ax25_ptr, we need to set it to NULL otherwise we may use a dangling pointer. 2. There is a race between ax25_setsockopt() and device notifier as reported by syzbot. Close it by holding RTNL lock. 3. We need to test if dev->ax25_ptr is NULL before using it. Reported-and-tested-by: [email protected] Signed-off-by: Cong Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c04c050 commit 3e881d8

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

net/ax25/af_ax25.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,15 +653,22 @@ static int ax25_setsockopt(struct socket *sock, int level, int optname,
653653
break;
654654
}
655655

656-
dev = dev_get_by_name(&init_net, devname);
656+
rtnl_lock();
657+
dev = __dev_get_by_name(&init_net, devname);
657658
if (!dev) {
659+
rtnl_unlock();
658660
res = -ENODEV;
659661
break;
660662
}
661663

662664
ax25->ax25_dev = ax25_dev_ax25dev(dev);
665+
if (!ax25->ax25_dev) {
666+
rtnl_unlock();
667+
res = -ENODEV;
668+
break;
669+
}
663670
ax25_fillin_cb(ax25, ax25->ax25_dev);
664-
dev_put(dev);
671+
rtnl_unlock();
665672
break;
666673

667674
default:

net/ax25/ax25_dev.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ void ax25_dev_device_down(struct net_device *dev)
116116
if ((s = ax25_dev_list) == ax25_dev) {
117117
ax25_dev_list = s->next;
118118
spin_unlock_bh(&ax25_dev_lock);
119+
dev->ax25_ptr = NULL;
119120
dev_put(dev);
120121
kfree(ax25_dev);
121122
return;
@@ -125,6 +126,7 @@ void ax25_dev_device_down(struct net_device *dev)
125126
if (s->next == ax25_dev) {
126127
s->next = ax25_dev->next;
127128
spin_unlock_bh(&ax25_dev_lock);
129+
dev->ax25_ptr = NULL;
128130
dev_put(dev);
129131
kfree(ax25_dev);
130132
return;

0 commit comments

Comments
 (0)