Skip to content

Commit 9d797ee

Browse files
q2venkuba-moo
authored andcommitted
Revert "af_unix: Call scm_recv() only after scm_set_cred()."
This reverts commit 3f5f118. Konrad reported that desktop environment below cannot be reached after commit 3f5f118 ("af_unix: Call scm_recv() only after scm_set_cred().") - postmarketOS (Alpine Linux w/ musl 1.2.4) - busybox 1.36.1 - GNOME 44.1 - networkmanager 1.42.6 - openrc 0.47 Regarding to the warning of SO_PASSPIDFD, I'll post another patch to suppress it by skipping SCM_PIDFD if scm->pid == NULL in scm_pidfd_recv(). Reported-by: Konrad Dybcio <konradybcio@kernel.org> Link: https://lore.kernel.org/netdev/8c7f9abd-4f84-7296-2788-1e130d6304a0@kernel.org/ Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com> Tested-by: Ido Schimmel <idosch@nvidia.com> Tested-by: Gal Pressman <gal@nvidia.com> Link: https://lore.kernel.org/r/20230626205837.82086-1-kuniyu@amazon.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 1a3f6fc commit 9d797ee

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

net/unix/af_unix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2807,7 +2807,7 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state,
28072807
} while (size);
28082808

28092809
mutex_unlock(&u->iolock);
2810-
if (state->msg && check_creds)
2810+
if (state->msg)
28112811
scm_recv(sock, state->msg, &scm, flags);
28122812
else
28132813
scm_destroy(&scm);

0 commit comments

Comments
 (0)