Commit ae230642 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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 5e2ff670 ("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: default avatarJakub Kicinski <kuba@kernel.org>
parents 30ac666a a9c49cc2

include/net/scm.h

+28 −11
Original line number Diff line number Diff line
@@ -135,7 +135,9 @@ static __inline__ void scm_pidfd_recv(struct msghdr *msg, struct scm_cookie *scm 
		return;

	}



	WARN_ON_ONCE(!scm->pid);

	if (!scm->pid)

		return;



	pidfd = pidfd_prepare(scm->pid, 0, &pidfd_file);



	if (put_cmsg(msg, SOL_SOCKET, SCM_PIDFD, sizeof(int), &pidfd)) {
@@ -151,7 +153,7 @@ static __inline__ void scm_pidfd_recv(struct msghdr *msg, struct scm_cookie *scm 
		fd_install(pidfd, pidfd_file);

}



static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,

static inline bool __scm_recv_common(struct socket *sock, struct msghdr *msg,

				     struct scm_cookie *scm, int flags)

{

	if (!msg->msg_control) {
@@ -160,7 +162,7 @@ static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, 
		    scm->fp || scm_has_secdata(sock))

			msg->msg_flags |= MSG_CTRUNC;

		scm_destroy(scm);

		return;

		return false;

	}



	if (test_bit(SOCK_PASSCRED, &sock->flags)) {
@@ -173,19 +175,34 @@ static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, 
		put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(ucreds), &ucreds);

	}



	if (test_bit(SOCK_PASSPIDFD, &sock->flags))

		scm_pidfd_recv(msg, scm);

	scm_passec(sock, msg, scm);



	scm_destroy_cred(scm);

	if (scm->fp)

		scm_detach_fds(msg, scm);



	scm_passec(sock, msg, scm);

	return true;

}



	if (!scm->fp)

static inline void scm_recv(struct socket *sock, struct msghdr *msg,

			    struct scm_cookie *scm, int flags)

{

	if (!__scm_recv_common(sock, msg, scm, flags))

		return;



	scm_detach_fds(msg, scm);

	scm_destroy_cred(scm);

}



static inline void scm_recv_unix(struct socket *sock, struct msghdr *msg,

				 struct scm_cookie *scm, int flags)

{

	if (!__scm_recv_common(sock, msg, scm, flags))

		return;



	if (test_bit(SOCK_PASSPIDFD, &sock->flags))

		scm_pidfd_recv(msg, scm);



	scm_destroy_cred(scm);

}



#endif /* __LINUX_NET_SCM_H */

net/unix/af_unix.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ static int unix_stream_read_generic(struct unix_stream_read_state *state, 


	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: