scm: add SO_PASSPIDFD and SCM_PIDFD

Implement SCM_PIDFD, a new type of CMSG type analogical to SCM_CREDENTIALS,
but it contains pidfd instead of plain pid, which allows programmers not
to care about PID reuse problem.

We mask SO_PASSPIDFD feature if CONFIG_UNIX is not builtin because
it depends on a pidfd_prepare() API which is not exported to the kernel
modules.

Idea comes from UAPI kernel group:
https://uapi-group.org/kernel-features/

Big thanks to Christian Brauner and Lennart Poettering for productive
discussions about this.

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: Leon Romanovsky <leon@kernel.org>
Cc: David Ahern <dsahern@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kees Cook <keescook@chromium.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Kuniyuki Iwashima <kuniyu@amazon.com>
Cc: Lennart Poettering <mzxreary@0pointer.de>
Cc: Luca Boccassi <bluca@debian.org>
Cc: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Tested-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
index 739891b94136539a3a40fd6ceaab55c56f62cec7..ff310613ae64dab051339f1597991ada923be7f5 100644 (file)
--- a/arch/alpha/include/uapi/asm/socket.h
+++ b/arch/alpha/include/uapi/asm/socket.h
@@ -137,6 +137,8 @@
 
 #define SO_RCVMARK             75
 
+#define SO_PASSPIDFD           76
+
 #if !defined(__KERNEL__)
 
 #if __BITS_PER_LONG == 64

diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/asm/socket.h
index 18f3d95ecfec1d9e14e2aa60703a8ab0a875c378..762dcb80e4ec6828a09870914727e9dfe6d86846 100644 (file)
--- a/arch/mips/include/uapi/asm/socket.h
+++ b/arch/mips/include/uapi/asm/socket.h
@@ -148,6 +148,8 @@
 
 #define SO_RCVMARK             75
 
+#define SO_PASSPIDFD           76
+
 #if !defined(__KERNEL__)
 
 #if __BITS_PER_LONG == 64

diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index f486d3dfb6bb6245c7badb863dc5354b2049e45b..df16a3e16d645dd5a79308cd26bdc1af80a1b67a 100644 (file)
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h
@@ -129,6 +129,8 @@
 
 #define SO_RCVMARK             0x4049
 
+#define SO_PASSPIDFD           0x404A
+
 #if !defined(__KERNEL__)
 
 #if __BITS_PER_LONG == 64

diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi/asm/socket.h
index 2fda57a3ea86e6e953d2644b9c5d218a2764ff54..6e2847804fea762a3cb10903fb0cb15e64a7bc91 100644 (file)
--- a/arch/sparc/include/uapi/asm/socket.h
+++ b/arch/sparc/include/uapi/asm/socket.h
@@ -130,6 +130,8 @@
 
 #define SO_RCVMARK               0x0054
 
+#define SO_PASSPIDFD             0x0055
+
 #if !defined(__KERNEL__)
 
 

diff --git a/include/linux/net.h b/include/linux/net.h
index 8defc8f1d82e619ed2f154c0db1c5fcef5b1b6c6..23324e9a2b3d25c770f9918d6fa8d5c6691c9e99 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -43,6 +43,7 @@ struct net;
 #define SOCK_PASSSEC           4
 #define SOCK_SUPPORT_ZC                5
 #define SOCK_CUSTOM_SOCKOPT    6
+#define SOCK_PASSPIDFD         7
 
 #ifndef ARCH_HAS_SOCKET_TYPES
 /**

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 3fd3436bc09f8ce1e2a35485fda29f5cd52cdeb5..58204700018af7eb1b2893c8da7169fd2b4a0742 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -177,6 +177,7 @@ static inline size_t msg_data_left(struct msghdr *msg)
 #define        SCM_RIGHTS      0x01            /* rw: access rights (array of int) */
 #define SCM_CREDENTIALS 0x02           /* rw: struct ucred             */
 #define SCM_SECURITY   0x03            /* rw: security label           */
+#define SCM_PIDFD      0x04            /* ro: pidfd (int)              */
 
 struct ucred {
        __u32   pid;

diff --git a/include/net/scm.h b/include/net/scm.h
index 585adc1346bd0150c4e4bafb181cb87445c92564..c67f765a165b510d36d1ae3d3dea49fb3c49d961 100644 (file)
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -120,12 +120,44 @@ static inline bool scm_has_secdata(struct socket *sock)
 }
 #endif /* CONFIG_SECURITY_NETWORK */
 
+static __inline__ void scm_pidfd_recv(struct msghdr *msg, struct scm_cookie *scm)
+{
+       struct file *pidfd_file = NULL;
+       int pidfd;
+
+       /*
+        * put_cmsg() doesn't return an error if CMSG is truncated,
+        * that's why we need to opencode these checks here.
+        */
+       if ((msg->msg_controllen <= sizeof(struct cmsghdr)) ||
+           (msg->msg_controllen - sizeof(struct cmsghdr)) < sizeof(int)) {
+               msg->msg_flags |= MSG_CTRUNC;
+               return;
+       }
+
+       WARN_ON_ONCE(!scm->pid);
+       pidfd = pidfd_prepare(scm->pid, 0, &pidfd_file);
+
+       if (put_cmsg(msg, SOL_SOCKET, SCM_PIDFD, sizeof(int), &pidfd)) {
+               if (pidfd_file) {
+                       put_unused_fd(pidfd);
+                       fput(pidfd_file);
+               }
+
+               return;
+       }
+
+       if (pidfd_file)
+               fd_install(pidfd, pidfd_file);
+}
+
 static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
                                struct scm_cookie *scm, int flags)
 {
        if (!msg->msg_control) {
-               if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp ||
-                   scm_has_secdata(sock))
+               if (test_bit(SOCK_PASSCRED, &sock->flags) ||
+                   test_bit(SOCK_PASSPIDFD, &sock->flags) ||
+                   scm->fp || scm_has_secdata(sock))
                        msg->msg_flags |= MSG_CTRUNC;
                scm_destroy(scm);
                return;
@@ -141,6 +173,9 @@ 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_destroy_cred(scm);
 
        scm_passec(sock, msg, scm);

diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h
index 638230899e9869574a4d60fe1577c65f3652aa34..b76169fdb80b1163484d1bd4dbd7708debbfb337 100644 (file)
--- a/include/uapi/asm-generic/socket.h
+++ b/include/uapi/asm-generic/socket.h
@@ -132,6 +132,8 @@
 
 #define SO_RCVMARK             75
 
+#define SO_PASSPIDFD           76
+
 #if !defined(__KERNEL__)
 
 #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))

diff --git a/net/core/sock.c b/net/core/sock.c
index 24f2761bdb1d86ac36f7964ad456864db461f20d..ed4eb4ba738b6fa162b3070fcad7d96e97d2a96a 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1246,6 +1246,13 @@ set_sndbuf:
                        clear_bit(SOCK_PASSCRED, &sock->flags);
                break;
 
+       case SO_PASSPIDFD:
+               if (valbool)
+                       set_bit(SOCK_PASSPIDFD, &sock->flags);
+               else
+                       clear_bit(SOCK_PASSPIDFD, &sock->flags);
+               break;
+
        case SO_TIMESTAMP_OLD:
        case SO_TIMESTAMP_NEW:
        case SO_TIMESTAMPNS_OLD:
@@ -1732,6 +1739,10 @@ int sk_getsockopt(struct sock *sk, int level, int optname,
                v.val = !!test_bit(SOCK_PASSCRED, &sock->flags);
                break;
 
+       case SO_PASSPIDFD:
+               v.val = !!test_bit(SOCK_PASSPIDFD, &sock->flags);
+               break;
+
        case SO_PEERCRED:
        {
                struct ucred peercred;

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index d4258869ac48fe97bdf99dc48fbb7d145e353726..e172a5848b0de67e685d46fe276d77e321e8e999 100644 (file)
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -355,6 +355,7 @@ static int mptcp_setsockopt_sol_socket(struct mptcp_sock *msk, int optname,
        case SO_BROADCAST:
        case SO_BSDCOMPAT:
        case SO_PASSCRED:
+       case SO_PASSPIDFD:
        case SO_PASSSEC:
        case SO_RXQ_OVFL:
        case SO_WIFI_STATUS:

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 653136d68b3295c359e95020cfb67b57ff3d9948..c46c2f5d860c4e7db5bc7031f1f45985623280ec 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1361,7 +1361,8 @@ static int unix_dgram_connect(struct socket *sock, struct sockaddr *addr,
                if (err)
                        goto out;
 
-               if (test_bit(SOCK_PASSCRED, &sock->flags) &&
+               if ((test_bit(SOCK_PASSCRED, &sock->flags) ||
+                    test_bit(SOCK_PASSPIDFD, &sock->flags)) &&
                    !unix_sk(sk)->addr) {
                        err = unix_autobind(sk);
                        if (err)
@@ -1469,7 +1470,8 @@ static int unix_stream_connect(struct socket *sock, struct sockaddr *uaddr,
        if (err)
                goto out;
 
-       if (test_bit(SOCK_PASSCRED, &sock->flags) && !u->addr) {
+       if ((test_bit(SOCK_PASSCRED, &sock->flags) ||
+            test_bit(SOCK_PASSPIDFD, &sock->flags)) && !u->addr) {
                err = unix_autobind(sk);
                if (err)
                        goto out;
@@ -1670,6 +1672,8 @@ static void unix_sock_inherit_flags(const struct socket *old,
 {
        if (test_bit(SOCK_PASSCRED, &old->flags))
                set_bit(SOCK_PASSCRED, &new->flags);
+       if (test_bit(SOCK_PASSPIDFD, &old->flags))
+               set_bit(SOCK_PASSPIDFD, &new->flags);
        if (test_bit(SOCK_PASSSEC, &old->flags))
                set_bit(SOCK_PASSSEC, &new->flags);
 }
@@ -1819,8 +1823,10 @@ static bool unix_passcred_enabled(const struct socket *sock,
                                  const struct sock *other)
 {
        return test_bit(SOCK_PASSCRED, &sock->flags) ||
+              test_bit(SOCK_PASSPIDFD, &sock->flags) ||
               !other->sk_socket ||
-              test_bit(SOCK_PASSCRED, &other->sk_socket->flags);
+              test_bit(SOCK_PASSCRED, &other->sk_socket->flags) ||
+              test_bit(SOCK_PASSPIDFD, &other->sk_socket->flags);
 }
 
 /*
@@ -1904,7 +1910,8 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg,
                        goto out;
        }
 
-       if (test_bit(SOCK_PASSCRED, &sock->flags) && !u->addr) {
+       if ((test_bit(SOCK_PASSCRED, &sock->flags) ||
+            test_bit(SOCK_PASSPIDFD, &sock->flags)) && !u->addr) {
                err = unix_autobind(sk);
                if (err)
                        goto out;
@@ -2718,7 +2725,8 @@ unlock:
                        /* Never glue messages from different writers */
                        if (!unix_skb_scm_eq(skb, &scm))
                                break;
-               } else if (test_bit(SOCK_PASSCRED, &sock->flags)) {
+               } else if (test_bit(SOCK_PASSCRED, &sock->flags) ||
+                          test_bit(SOCK_PASSPIDFD, &sock->flags)) {
                        /* Copy credentials */
                        scm_set_cred(&scm, UNIXCB(skb).pid, UNIXCB(skb).uid, UNIXCB(skb).gid);
                        unix_set_secdata(&scm, skb);

diff --git a/tools/include/uapi/asm-generic/socket.h b/tools/include/uapi/asm-generic/socket.h
index 8756df13be508655ab3ff75ce389ce18a9cec0d4..fbbc4bf53ee3f0753b9b1d7059c4e7ee2f1d7b66 100644 (file)
--- a/tools/include/uapi/asm-generic/socket.h
+++ b/tools/include/uapi/asm-generic/socket.h
@@ -121,6 +121,8 @@
 
 #define SO_RCVMARK             75
 
+#define SO_PASSPIDFD           76
+
 #if !defined(__KERNEL__)
 
 #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__))