bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ax25: NPD bug when detaching AX25 device

Browse source 
The existing cleanup routine implementation is not well synchronized
with the syscall routine. When a device is detaching, below race could
occur.

static int ax25_sendmsg(...) {
  ...
  lock_sock()
  ax25 = sk_to_ax25(sk);
  if (ax25->ax25_dev == NULL) // CHECK
  ...
  ax25_queue_xmit(skb, ax25->ax25_dev->dev); // USE
  ...
}

static void ax25_kill_by_device(...) {
  ...
  if (s->ax25_dev == ax25_dev) {
    s->ax25_dev = NULL;
    ...
}

Other syscall functions like ax25_getsockopt, ax25_getname,
ax25_info_show also suffer from similar races. To fix them, this patch
introduce lock_sock() into ax25_kill_by_device in order to guarantee
that the nullify action in cleanup routine cannot proceed when another
socket request is pending.

Signed-off-by: Hanjie Wu <nagi@zju.edu.cn>
Signed-off-by: Lin Ma <linma@zju.edu.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lin Ma 2021-12-17 10:29:41 +08:00 • committed by David S. Miller
parent b2f37aead1
commit 1ade48d0c2
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/ax25/af_ax25.c
View file

@ -85,8 +85,10 @@ static void ax25_kill_by_device(struct net_device *dev)
again: again:
ax25_for_each(s, &ax25_list) { ax25_for_each(s, &ax25_list) {
if (s->ax25_dev == ax25_dev) { if (s->ax25_dev == ax25_dev) {
s->ax25_dev = NULL;
spin_unlock_bh(&ax25_list_lock); spin_unlock_bh(&ax25_list_lock);
lock_sock(s->sk);
s->ax25_dev = NULL;
release_sock(s->sk);
ax25_disconnect(s, ENETUNREACH); ax25_disconnect(s, ENETUNREACH);
spin_lock_bh(&ax25_list_lock); spin_lock_bh(&ax25_list_lock);