diff options
| author | Qingfang Deng <qingfang.deng@linux.dev> | 2026-08-11 14:02:29 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-08-12 17:14:20 -0700 |
| commit | 095887cb96a36b917dbdf163c165e2f294d8eefa (patch) | |
| tree | 6082d493020e35f31a208872d13726066e2fa016 | |
| parent | ac155a26750a595703e7dadff84735456d75a479 (diff) | |
| download | linux-next-095887cb96a36b917dbdf163c165e2f294d8eefa.tar.gz linux-next-095887cb96a36b917dbdf163c165e2f294d8eefa.zip | |
ppp: annotate lockless queue empty check
ppp_poll() checks whether pf->rq contains a packet without holding the
queue lock. skb_peek() requires appropriate locking or a private queue,
neither of which applies because ppp_input() can enqueue concurrently.
Only queue emptiness is needed, so use skb_queue_empty_lockless()
instead.
Cc: stable+noautosel@kernel.org # race annotation
Signed-off-by: Qingfang Deng <qingfang.deng@linux.dev>
Reviewed-by: Breno Leitao <leitao@debian.org.
Link: https://patch.msgid.link/20260811060236.322284-1-qingfang.deng@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index e1013621eb1d..1a610a18893b 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -556,7 +556,7 @@ static __poll_t ppp_poll(struct file *file, poll_table *wait) return 0; poll_wait(file, &pf->rwait, wait); mask = EPOLLOUT | EPOLLWRNORM; - if (skb_peek(&pf->rq)) + if (!skb_queue_empty_lockless(&pf->rq)) mask |= EPOLLIN | EPOLLRDNORM; if (pf->dead) mask |= EPOLLHUP; |