Skip to content

Commit 30580dc

Browse files
mihalicynbrauner
authored andcommitted
af_unix: introduce and use scm_replace_pid() helper
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@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: Willem de Bruijn <willemb@google.com> 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: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com> Link: https://lore.kernel.org/20250703222314.309967-4-aleksandr.mikhalitsyn@canonical.com Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com> Signed-off-by: Christian Brauner <brauner@kernel.org>
1 parent ee47976 commit 30580dc

1 file changed

Lines changed: 19 additions & 3 deletions

File tree

net/core/scm.c

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,16 @@ void __scm_destroy(struct scm_cookie *scm)
145145
}
146146
EXPORT_SYMBOL(__scm_destroy);
147147

148+
static inline int scm_replace_pid(struct scm_cookie *scm, struct pid *pid)
149+
{
150+
/* drop all previous references */
151+
scm_destroy_cred(scm);
152+
153+
scm->pid = pid;
154+
scm->creds.pid = pid_vnr(pid);
155+
return 0;
156+
}
157+
148158
int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p)
149159
{
150160
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)
189199
if (err)
190200
goto error;
191201

192-
p->creds.pid = creds.pid;
193202
if (!p->pid || pid_vnr(p->pid) != creds.pid) {
194203
struct pid *pid;
195204
err = -ESRCH;
196205
pid = find_get_pid(creds.pid);
197206
if (!pid)
198207
goto error;
199-
put_pid(p->pid);
200-
p->pid = pid;
208+
209+
/* pass a struct pid reference from
210+
* find_get_pid() to scm_replace_pid().
211+
*/
212+
err = scm_replace_pid(p, pid);
213+
if (err) {
214+
put_pid(pid);
215+
goto error;
216+
}
201217
}
202218

203219
err = -EINVAL;

0 commit comments

Comments
 (0)