diff options
| author | Bartosz Golaszewski <[email protected]> | 2023-12-18 12:31:29 +0000 |
|---|---|---|
| committer | Bartosz Golaszewski <[email protected]> | 2023-12-18 12:31:29 +0000 |
| commit | 12b7f4ddfcb66dafed432cf4a987f5b40179c0f1 (patch) | |
| tree | 1e57a7d047e575d891302fb68fdfcd682fe84a5f /net/unix/af_unix.c | |
| parent | dt-bindings: gpio: dwapb: allow gpio-ranges (diff) | |
| parent | device property: Implement device_is_big_endian() (diff) | |
| download | kernel-12b7f4ddfcb66dafed432cf4a987f5b40179c0f1.tar.gz kernel-12b7f4ddfcb66dafed432cf4a987f5b40179c0f1.zip | |
Merge tag 'device_is_big_endian-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into gpio/for-next
Tag for the device_is_big_endian() addition to property.h
For others to be able to pull from in a stable way.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 45506a95b25f..a357dc5f2404 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2581,15 +2581,16 @@ static int unix_stream_recv_urg(struct unix_stream_read_state *state) if (!(state->flags & MSG_PEEK)) WRITE_ONCE(u->oob_skb, NULL); - + else + skb_get(oob_skb); unix_state_unlock(sk); chunk = state->recv_actor(oob_skb, 0, chunk, state); - if (!(state->flags & MSG_PEEK)) { + if (!(state->flags & MSG_PEEK)) UNIXCB(oob_skb).consumed += 1; - kfree_skb(oob_skb); - } + + consume_skb(oob_skb); mutex_unlock(&u->iolock); |