diff options
| author | Takashi Iwai <tiwai@suse.de> | 2025-06-26 08:59:33 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2025-06-26 08:59:33 +0300 |
| commit | 346bd8a977fc559ef41099f727cdb0805f66bd10 (patch) | |
| tree | ea2304801566b4a498957a5be469be8e0cc51686 /net/unix/af_unix.c | |
| parent | 5e9571750c4e53d16727a04159455c693d7b31cb (diff) | |
| parent | 6c038b58a2dc5a008c7e7a1297f5aaa4deaaaa7e (diff) | |
| download | linux-346bd8a977fc559ef41099f727cdb0805f66bd10.tar.xz | |
Merge tag 'asoc-fix-v6.16-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.16
A small collection of fixes, the main one being a fix for resume from
hibernation on AMD systems, plus a few new quirk entries for AMD
systems.
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 2e2e9997a68e..22e170fb5dda 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1971,7 +1971,8 @@ static void unix_maybe_add_creds(struct sk_buff *skb, const struct sock *sk, if (UNIXCB(skb).pid) return; - if (unix_may_passcred(sk) || unix_may_passcred(other)) { + if (unix_may_passcred(sk) || unix_may_passcred(other) || + !other->sk_socket) { UNIXCB(skb).pid = get_pid(task_tgid(current)); current_uid_gid(&UNIXCB(skb).uid, &UNIXCB(skb).gid); } |