diff options
author | Dan Williams <dan.j.williams@intel.com> | 2024-01-02 22:03:04 +0300 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2024-01-02 22:03:04 +0300 |
commit | 11c83932028714014e4259072bd230473d6db730 (patch) | |
tree | ba5de3af7a65a6a60ebb1f0a36328fd853130ecd /net/rose | |
parent | 58f1e9d3a30438042fc9ed65b3dc56b2e5f7886a (diff) | |
parent | 185c1a489f873cb71520fc089401e02dbf302dcd (diff) | |
download | linux-11c83932028714014e4259072bd230473d6db730.tar.xz |
Merge branch 'for-6.8/cxl-cdat' into for-6.8/cxl
Pick up the CDAT parsing and QOS class infrastructure for v6.8.
Diffstat (limited to 'net/rose')
-rw-r--r-- | net/rose/af_rose.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 0cc5a4e19900..ecb91ad4ce63 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -1315,9 +1315,11 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) case TIOCINQ: { struct sk_buff *skb; long amount = 0L; - /* These two are safe on a single CPU system as only user tasks fiddle here */ + + spin_lock_irq(&sk->sk_receive_queue.lock); if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) amount = skb->len; + spin_unlock_irq(&sk->sk_receive_queue.lock); return put_user(amount, (unsigned int __user *) argp); } |