summaryrefslogtreecommitdiff
path: root/net/unix
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2025-06-23 23:30:49 +0100
committerMark Brown <broonie@kernel.org>2025-06-23 23:30:49 +0100
commit1256eb42db5d1635f4c6da5b1b58db0b53320883 (patch)
tree4a06ef5a4ed8e2f67ead59ad4257a7e6524ed8b1 /net/unix
parent5fc2c383125c2b4b6037e02ad8796b776b25e6d0 (diff)
parent8f9cf02c8852837923f1cdacfcc92e138513325c (diff)
spi: microchip-core-qspi: Add regular transfers
Merge series from Conor Dooley <conor@kernel.org>: This is a v2 of a patchset I sent about this time last year, adding the regular transfer_one_message op to the microchip-core-qspi driver. In that v1 Mark expressed his dislike for that op, so v2 is using prepare/unprepare/transfer_one instead. The unprepare implementation still contains the 750 us delay that the driver had back in v1. I've heard a suggestion internally as to why this is needed, but it was unsubstantiated, so I still have no justification for it. I held off on sending a v2 because of a lack of explanation for the delay, but I don't wanna hold off forever for something I might never understand.
Diffstat (limited to 'net/unix')
-rw-r--r--net/unix/af_unix.c3
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);
}