Unverified Commit 2775832f authored by Alexander Mikhalitsyn's avatar Alexander Mikhalitsyn Committed by Christian Brauner
Browse files

af_unix: stash pidfs dentry when needed 



We need to ensure that pidfs dentry is allocated when we meet any
struct pid for the first time. This will allows us to open pidfd
even after the task it corresponds to is reaped.

Basically, we need to identify all places where we fill skb/scm_cookie
with struct pid reference for the first time and call pidfs_register_pid().

Tricky thing here is that we have a few places where this happends
depending on what userspace is doing:
- [__scm_replace_pid()] explicitly sending an SCM_CREDENTIALS message
                        and specified pid in a numeric format
- [unix_maybe_add_creds()] enabled SO_PASSCRED/SO_PASSPIDFD but
                           didn't send SCM_CREDENTIALS explicitly
- [scm_send()] force_creds is true. Netlink case, we don't need to touch it.

Cc: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Simon Horman <horms@kernel.org>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Kuniyuki Iwashima <kuniyu@google.com>
Cc: Lennart Poettering <mzxreary@0pointer.de>
Cc: Luca Boccassi <bluca@debian.org>
Cc: David Rheinsberg <david@readahead.eu>
Signed-off-by: default avatarAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Link: https://lore.kernel.org/20250703222314.309967-6-aleksandr.mikhalitsyn@canonical.com


Reviewed-by: default avatarKuniyuki Iwashima <kuniyu@google.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 2b999641

net/core/scm.c

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/security.h>

#include <linux/pid_namespace.h>

#include <linux/pid.h>

#include <linux/pidfs.h>

#include <linux/nsproxy.h>

#include <linux/slab.h>

#include <linux/errqueue.h>
@@ -147,9 +148,15 @@ EXPORT_SYMBOL(__scm_destroy); 


static inline int scm_replace_pid(struct scm_cookie *scm, struct pid *pid)

{

	int err;



	/* drop all previous references */

	scm_destroy_cred(scm);



	err = pidfs_register_pid(pid);

	if (unlikely(err))

		return err;



	scm->pid = pid;

	scm->creds.pid = pid_vnr(pid);

	return 0;

net/unix/af_unix.c

+10 −1
Original line number Diff line number Diff line
@@ -1971,6 +1971,7 @@ static void unix_skb_to_scm(struct sk_buff *skb, struct scm_cookie *scm) 
 * We include credentials if source or destination socket

 * asserted SOCK_PASSCRED.

 *

 * Context: May sleep.

 * Return: On success zero, on error a negative error code is returned.

 */

static int unix_maybe_add_creds(struct sk_buff *skb, const struct sock *sk,
@@ -1980,7 +1981,15 @@ static int unix_maybe_add_creds(struct sk_buff *skb, const struct sock *sk, 
		return 0;



	if (unix_may_passcred(sk) || unix_may_passcred(other)) {

		UNIXCB(skb).pid = get_pid(task_tgid(current));

		struct pid *pid;

		int err;



		pid = task_tgid(current);

		err = pidfs_register_pid(pid);

		if (unlikely(err))

			return err;



		UNIXCB(skb).pid = get_pid(pid);

		current_uid_gid(&UNIXCB(skb).uid, &UNIXCB(skb).gid);

	}