[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250425-work-pidfs-net-v2-4-450a19461e75@kernel.org>
Date: Fri, 25 Apr 2025 10:11:33 +0200
From: Christian Brauner <brauner@...nel.org>
To: Oleg Nesterov <oleg@...hat.com>, Kuniyuki Iwashima <kuniyu@...zon.com>,
"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>
Cc: linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org,
netdev@...r.kernel.org, David Rheinsberg <david@...dahead.eu>,
Jan Kara <jack@...e.cz>, Alexander Mikhalitsyn <alexander@...alicyn.com>,
Luca Boccassi <bluca@...ian.org>,
Lennart Poettering <lennart@...ttering.net>,
Daan De Meyer <daan.j.demeyer@...il.com>, Mike Yuan <me@...dnzj.com>,
Christian Brauner <brauner@...nel.org>
Subject: [PATCH v2 4/4] net, pidfs: enable handing out pidfds for reaped
sk->sk_peer_pid
Now that all preconditions are met, allow handing out pidfs for reaped
sk->sk_peer_pids.
Signed-off-by: Christian Brauner <brauner@...nel.org>
---
net/core/sock.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index b969d2210656..5ad0b53d0fb0 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -148,6 +148,8 @@
#include <linux/ethtool.h>
+#include <uapi/linux/pidfd.h>
+
#include "dev.h"
static DEFINE_MUTEX(proto_list_mutex);
@@ -1891,18 +1893,10 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
if (!peer_pid)
return -ENODATA;
- pidfd = pidfd_prepare(peer_pid, 0, &pidfd_file);
+ pidfd = pidfd_prepare(peer_pid, PIDFD_STALE, &pidfd_file);
put_pid(peer_pid);
- if (pidfd < 0) {
- /*
- * dbus-broker relies on -EINVAL being returned
- * to indicate ESRCH. Paper over it until this
- * is fixed in userspace.
- */
- if (pidfd == -ESRCH)
- pidfd = -EINVAL;
+ if (pidfd < 0)
return pidfd;
- }
if (copy_to_sockptr(optval, &pidfd, len) ||
copy_to_sockptr(optlen, &len, sizeof(int))) {
--
2.47.2
Powered by blists - more mailing lists