Commit 9d797ee2 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Jakub Kicinski
Browse files

Revert "af_unix: Call scm_recv() only after scm_set_cred()." 



This reverts commit 3f5f118b.

Konrad reported that desktop environment below cannot be reached after
commit 3f5f118b ("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: default avatarKonrad Dybcio <konradybcio@kernel.org>
Link: https://lore.kernel.org/netdev/8c7f9abd-4f84-7296-2788-1e130d6304a0@kernel.org/


Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Tested-by: default avatarIdo Schimmel <idosch@nvidia.com>
Tested-by: default avatarGal Pressman <gal@nvidia.com>
Link: https://lore.kernel.org/r/20230626205837.82086-1-kuniyu@amazon.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1a3f6fc4

net/unix/af_unix.c

+1 −1
Original line number Diff line number Diff line
@@ -2807,7 +2807,7 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state, 
	} while (size);



	mutex_unlock(&u->iolock);

	if (state->msg && check_creds)

	if (state->msg)

		scm_recv(sock, state->msg, &scm, flags);

	else

		scm_destroy(&scm);