linux-kernel - Re: [PATCH net-next v2 3/6] af_unix: introduce and use __scm_replace

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAAVpQUAXwWE6ssHYwaA4Wi4U0j_VOQ0vPD6oTAEhEV3q92fPnQ@mail.gmail.com>
Date: Wed, 2 Jul 2025 19:12:31 -0700
From: Kuniyuki Iwashima <kuniyu@...gle.com>
To: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@...onical.com>
Cc: linux-kernel@...r.kernel.org, netdev@...r.kernel.org, 
	"David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, 
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>, 
	Willem de Bruijn <willemb@...gle.com>, Leon Romanovsky <leon@...nel.org>, Arnd Bergmann <arnd@...db.de>, 
	Christian Brauner <brauner@...nel.org>, Lennart Poettering <mzxreary@...inter.de>, 
	Luca Boccassi <bluca@...ian.org>, David Rheinsberg <david@...dahead.eu>
Subject: Re: [PATCH net-next v2 3/6] af_unix: introduce and use
 __scm_replace_pid() helper

On Tue, Jul 1, 2025 at 1:41 AM Alexander Mikhalitsyn
<aleksandr.mikhalitsyn@...onical.com> wrote:
>
> Existing logic in __scm_send() related to filling an struct scm_cookie
> with a proper struct pid reference is already pretty tricky. Let's
> simplify it a bit by introducing a new helper. This helper will be
> extended in one of the next patches.
>
> Cc: linux-kernel@...r.kernel.org
> Cc: netdev@...r.kernel.org
> Cc: "David S. Miller" <davem@...emloft.net>
> Cc: Eric Dumazet <edumazet@...gle.com>
> Cc: Jakub Kicinski <kuba@...nel.org>
> Cc: Paolo Abeni <pabeni@...hat.com>
> Cc: Simon Horman <horms@...nel.org>
> Cc: Willem de Bruijn <willemb@...gle.com>
> Cc: Leon Romanovsky <leon@...nel.org>
> Cc: Arnd Bergmann <arnd@...db.de>
> Cc: Christian Brauner <brauner@...nel.org>
> Cc: Kuniyuki Iwashima <kuniyu@...gle.com>
> Cc: Lennart Poettering <mzxreary@...inter.de>
> Cc: Luca Boccassi <bluca@...ian.org>
> Cc: David Rheinsberg <david@...dahead.eu>
> Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@...onical.com>
> ---
> v2:
>         - don't do get_pid() in __scm_replace_pid() [ as Kuniyuki suggested ]
>         - move __scm_replace_pid() from scm.h to scm.c [ as Kuniyuki suggested ]
> ---
>  net/core/scm.c | 22 +++++++++++++++++++---
>  1 file changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/net/core/scm.c b/net/core/scm.c
> index 0225bd94170f..68441c024dd8 100644
> --- a/net/core/scm.c
> +++ b/net/core/scm.c
> @@ -145,6 +145,16 @@ void __scm_destroy(struct scm_cookie *scm)
>  }
>  EXPORT_SYMBOL(__scm_destroy);
>
> +static inline int __scm_replace_pid(struct scm_cookie *scm, struct pid *pid)

As you will need v3, I'd remove "__" because there's no-prefix-version.


> +{
> +       /* drop all previous references */
> +       scm_destroy_cred(scm);
> +
> +       scm->pid = pid;
> +       scm->creds.pid = pid_vnr(pid);
> +       return 0;
> +}
> +
>  int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
>  {
>         const struct proto_ops *ops = READ_ONCE(sock->ops);
> @@ -189,15 +199,21 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
>                         if (err)
>                                 goto error;
>
> -                       p->creds.pid = creds.pid;
>                         if (!p->pid || pid_vnr(p->pid) != creds.pid) {
>                                 struct pid *pid;
>                                 err = -ESRCH;
>                                 pid = find_get_pid(creds.pid);
>                                 if (!pid)
>                                         goto error;
> -                               put_pid(p->pid);
> -                               p->pid = pid;
> +
> +                               /* pass a struct pid reference from
> +                                * find_get_pid() to __scm_replace_pid().
> +                                */
> +                               err = __scm_replace_pid(p, pid);
> +                               if (err) {
> +                                       put_pid(pid);
> +                                       goto error;
> +                               }
>                         }
>
>                         err = -EINVAL;
> --
> 2.43.0
>