diff options
author | Mark Brown <broonie@kernel.org> | 2023-05-30 20:41:29 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-05-30 20:41:29 +0100 |
commit | b48aa6a3577cccd13ea21392540f6cde437dd04d (patch) | |
tree | 77091078bd9c3fd7c38efea83ec71a0719676819 /drivers/net/tun.c | |
parent | f2d4aa7e97eb60f426b92b95da712a6b3c18dc9a (diff) | |
parent | 60413129ee2b38a80347489270af7f6e1c1de4d0 (diff) |
ES8316 audio codec fixes on Rock5B
Merge series from Cristian Ciocaltea <cristian.ciocaltea@collabora.com>:
This patch series handles a few issues related to the ES8316 audio
codec, discovered while doing some testing on the Rock 5B board.
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r-- | drivers/net/tun.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index d4d0a41a905a..d75456adc62a 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1977,6 +1977,14 @@ napi_busy: int queue_len; spin_lock_bh(&queue->lock); + + if (unlikely(tfile->detached)) { + spin_unlock_bh(&queue->lock); + rcu_read_unlock(); + err = -EBUSY; + goto free_skb; + } + __skb_queue_tail(queue, skb); queue_len = skb_queue_len(queue); spin_unlock(&queue->lock); @@ -2512,6 +2520,13 @@ build: if (tfile->napi_enabled) { queue = &tfile->sk.sk_write_queue; spin_lock(&queue->lock); + + if (unlikely(tfile->detached)) { + spin_unlock(&queue->lock); + kfree_skb(skb); + return -EBUSY; + } + __skb_queue_tail(queue, skb); spin_unlock(&queue->lock); ret = 1; |