From: Shuai Liu <847807867@qq.com>
To: ms@dev.tdt.de, linux-x25@vger.kernel.org
Cc: netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org,
edumazet@kernel.org, pabeni@redhat.com, horms@kernel.org,
syzbot+300375dfd44665f063a6@syzkaller.appspotmail.com,
linux-kernel@vger.kernel.org, 847807867@qq.com
Subject: [PATCH] x25: defer socket cleanup on link termination to process context
Date: Mon, 16 Nov 2026 08:34:16 +0800 [thread overview]
Message-ID: <tencent_F7C2DC0FA42B5866E5C39A9E70D3C52C2609@qq.com> (raw)
In-Reply-To: <6acad256.a150a118.27e199.0030.GAE@google.com>
x25_kill_by_neigh() walks all sockets bound to a neighbour and calls
lock_sock() and x25_disconnect() on each one. It is invoked from
x25_link_terminated() and x25_link_control(), which both run in softirq
context when the LAPB link goes down or a restart frame arrives, e.g.
from the lapbether NAPI poll path.
lock_sock() takes a mutex in its slow path, so calling it from softirq
sleeps in atomic context:
BUG: sleeping function called from invalid context at net/core/sock.c:3839
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 14, name: ksoftirqd/0
...
lock_sock_nested+0x66/0x70
x25_kill_by_neigh+0x90/0x110
x25_link_terminated+0x18/0x50
x25_lapb_receive_frame+0x1c2/0x1f0
and lockdep flags the sk_lock-AF_X25 usage violation because the same
lock is registered in process context by x25_bind():
WARNING: inconsistent lock state
inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
ksoftirqd/0/14 [HC0[0]:SC1[1]:HE1:SE0] takes:
...
x25_kill_by_neigh+0x90/0x110
x25_link_terminated+0x18/0x50
x25_lapb_receive_frame+0x1c2/0x1f0
Defer the neighbour socket cleanup to a per-neighbour work item so it
always runs in process context. The work holds a reference on the
neighbour so the deferred cleanup cannot race with neighbour teardown.
x25_kill_by_neigh() is idempotent, so repeated scheduling is harmless.
Reported-by: syzbot+300375dfd44665f063a6@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=300375dfd44665f063a6
Signed-off-by: Shuai Liu <847807867@qq.com>
---
include/net/x25.h | 2 ++
net/x25/x25_link.c | 18 +++++++++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/include/net/x25.h b/include/net/x25.h
index 414f3fd993454..cb51be81351b8 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -13,6 +13,7 @@
#include <linux/x25.h>
#include <linux/slab.h>
#include <linux/refcount.h>
+#include <linux/workqueue.h>
#include <net/sock.h>
#define X25_ADDR_LEN 16
@@ -143,6 +144,7 @@ struct x25_neigh {
struct sk_buff_head queue;
unsigned long t20;
struct timer_list t20timer;
+ struct work_struct kill_work;
unsigned long global_facil_mask;
refcount_t refcnt;
};
diff --git a/net/x25/x25_link.c b/net/x25/x25_link.c
index d1e8cd81c2143..150ccd78cba64 100644
--- a/net/x25/x25_link.c
+++ b/net/x25/x25_link.c
@@ -58,6 +58,14 @@ static inline void x25_stop_t20timer(struct x25_neigh *nb)
timer_delete(&nb->t20timer);
}
+static void x25_kill_by_neigh_work(struct work_struct *work)
+{
+ struct x25_neigh *nb = container_of(work, struct x25_neigh, kill_work);
+
+ x25_kill_by_neigh(nb);
+ x25_neigh_put(nb);
+}
+
/*
* This handles all restart and diagnostic frames.
*/
@@ -82,7 +90,8 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,
break;
case X25_LINK_STATE_3:
/* clear existing virtual calls */
- x25_kill_by_neigh(nb);
+ x25_neigh_hold(nb);
+ schedule_work(&nb->kill_work);
x25_transmit_restart_confirmation(nb);
break;
@@ -97,7 +106,8 @@ void x25_link_control(struct sk_buff *skb, struct x25_neigh *nb,
break;
case X25_LINK_STATE_3:
/* clear existing virtual calls */
- x25_kill_by_neigh(nb);
+ x25_neigh_hold(nb);
+ schedule_work(&nb->kill_work);
x25_transmit_restart_request(nb);
nb->state = X25_LINK_STATE_2;
@@ -254,7 +264,8 @@ void x25_link_terminated(struct x25_neigh *nb)
x25_stop_t20timer(nb);
/* Out of order: clear existing virtual calls (X.25 03/93 4.6.3) */
- x25_kill_by_neigh(nb);
+ x25_neigh_hold(nb);
+ schedule_work(&nb->kill_work);
}
/*
@@ -269,6 +280,7 @@ void x25_link_device_up(struct net_device *dev)
skb_queue_head_init(&nb->queue);
timer_setup(&nb->t20timer, x25_t20timer_expiry, 0);
+ INIT_WORK(&nb->kill_work, x25_kill_by_neigh_work);
dev_hold(dev);
nb->dev = dev;
--
2.43.0
next prev parent reply other threads:[~2026-11-16 0:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-11 0:03 [syzbot] [x25?] inconsistent lock state in x25_kill_by_neigh (2) syzbot
2026-10-14 11:14 ` Forwarded: " syzbot
2026-10-14 11:15 ` syzbot
2026-11-16 0:34 ` Shuai Liu [this message]
2026-11-18 18:35 ` [PATCH] x25: defer socket cleanup on link termination to process context netdev-bot+sashiko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_F7C2DC0FA42B5866E5C39A9E70D3C52C2609@qq.com \
--to=847807867@qq.com \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-x25@vger.kernel.org \
--cc=ms@dev.tdt.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=syzbot+300375dfd44665f063a6@syzkaller.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®