diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 20:50:24 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-06-27 20:50:25 +0300 |
| commit | ae230642190a51b85656d6da2df744d534d59544 (patch) | |
| tree | 8c033bdb8f17c3ebf4c5f8ecc95aab953a1fd21c /net | |
| parent | 30ac666a2fccaa8c164199ea8844dc28aa714453 (diff) | |
| parent | a9c49cc2f5b578c4ffa0ee135aa552d06dec0e82 (diff) | |
| download | linux-ae230642190a51b85656d6da2df744d534d59544.tar.xz | |
Merge branch 'af_unix-followup-fixes-for-so_passpidfd'
Kuniyuki Iwashima says:
====================
af_unix: Followup fixes for SO_PASSPIDFD.
This series fixes 2 issues introduced by commit 5e2ff6704a27 ("scm: add
SO_PASSPIDFD and SCM_PIDFD").
The 1st patch fixes a warning in scm_pidfd_recv() reported by syzkaller.
The 2nd patch fixes a regression that bluetooth can't be built as module.
====================
Link: https://lore.kernel.org/r/20230627174314.67688-1-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/unix/af_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 3953daa2e1d0..123b35ddfd71 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2427,7 +2427,7 @@ int __unix_dgram_recvmsg(struct sock *sk, struct msghdr *msg, size_t size, } err = (flags & MSG_TRUNC) ? skb->len - skip : size; - scm_recv(sock, msg, &scm, flags); + scm_recv_unix(sock, msg, &scm, flags); out_free: skb_free_datagram(sk, skb); @@ -2808,7 +2808,7 @@ unlock: mutex_unlock(&u->iolock); if (state->msg) - scm_recv(sock, state->msg, &scm, flags); + scm_recv_unix(sock, state->msg, &scm, flags); else scm_destroy(&scm); out: |