From nobody Tue Sep 29 02:02:55 2026 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF415418346 for ; Thu, 13 Aug 2026 16:29:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786638552; cv=none; b=hm7Dm1lnu87no1I8GECyL6Pgl7UoGBL91jEOVR4RRu9RFyAnKj5iVIsMq/mABva1FIevE6LD8lCKy0zbaK+E+WJPnh1ZBam38g+c0t16jQNimAOHWyI/lQBVgU/bcfykqKGlwjSJupNZJRut1NYqyxd/hG5b7IJVXMg9yG6OwOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786638552; c=relaxed/simple; bh=6uL/fcMuXtkPICOYB8J42aD/5O5ueWcn9u4PGTRpS3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FzZpPtdEspMl7USpnWcb+4Cljlta7v56JZ2L/lc+wpkEBuJ4oyzxKUwLWu0MMkD7w06TIPOnoXXakxshAir64MqTOUg4bDDVF4fOXHjPzDXeYnO0S0wHjXlhHYsA4pb6NCrP1uKF8TNTJ9R7s2xqAZK/jRmqbrmGzLT2WFjLUDg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=K+fv5kJb; arc=none smtp.client-ip=195.121.94.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="K+fv5kJb" X-KPN-MessageId: 19cc7cfb-9734-11f1-83b3-005056ab378f Received: from smtp.kpnmail.nl (unknown [10.31.155.39]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id 19cc7cfb-9734-11f1-83b3-005056ab378f; Thu, 13 Aug 2026 18:29:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=xjSiY7CwFEzTBp15J3jfhjr7XplKvsglGkeWNI/XNN4=; b=K+fv5kJbIKBpPOiFIRpcWEVBeOl6fwFbeldAkzFTSnKvd+G0sPRWNSTSr4k7DqazVwKvVwBs55bek U8UL9KmTgt9OmL9rfGBKc6v4eOy/tqICPi/CqBulhhhFLJe/P4saAJAV2wrdCKBrAci5bWhQk22V37 1xM+XDlQYN5CxRcc6O7fzLXL//IgsNsDTPbZ5zPy0ixHbQ67NZrK9hhphAHXBxnaHWDc3msrNrVj0y E40G3QgfWe6MxOcHOKYkVqNbHX0MpoaUkldSKFFHwQMUcDOZwUytReBCFRO6Xpkvf9LzkWzFAvi/DI tPMuZTBSxufwXOD/kDRozqc65+5Ho6A== X-KPN-MID: 33|RD+tCzaHEQ80tYDhw98zz5D4Kivv614fLVKWTC9XAV8bE08X7BNddDDK1FyRGwO 21VZa+2/KUbQlnTQnJk7bYflpO3VLpgBEj1EGmEt4gqs= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|Qr+J+ApZ0m9A0AEChGBwy1KJDxdAB7qnH9vGDkwq69kW4lAYKmkyOtTmmSvQ9Zz OztFN5WHmxVOOjXLxXo/SQA== Received: from fedora (unknown [223.38.86.53]) by smtp.xs4all.nl (Halon) with ESMTPSA id 1530837f-9734-11f1-a8bc-005056ab7447; Thu, 13 Aug 2026 18:29:04 +0200 (CEST) From: Jori Koolstra To: brauner@kernel.org, cyphar@cyphar.com, kuniyu@google.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org Cc: netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, jkoolstra@xs4all.nl Subject: [PATCH net-next v7 1/4] net: af_unix: enable custom setsockopt for all socket types Date: Thu, 13 Aug 2026 12:28:15 -0400 Message-ID: <20260813162818.149248-2-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260813162818.149248-1-jkoolstra@xs4all.nl> References: <20260813162818.149248-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" unix_setsockopt() and the SOCK_CUSTOM_SOCKOPT flag were only wired up for SOCK_STREAM (introduced along with the stream-only SO_INQ). Consequently custom AF_UNIX options are unreachable on SOCK_DGRAM and SOCK_SEQPACKET: those setsockopt() calls bypass unix_setsockopt() and fall through to the generic sock_setsockopt(), failing with -ENOPROTOOPT. Set SOCK_CUSTOM_SOCKOPT for every AF_UNIX socket type in unix_create(), and also for accepted sockets in unix_accept() (reachable for stream and seqpacket). This is a prerequisite for making SO_RIGHTS_NOTRUNC settable on all AF_UNIX socket types. Signed-off-by: Jori Koolstra Reviewed-by: Kuniyuki Iwashima --- net/unix/af_unix.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 10ed9421e43a..51cbf920130d 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -950,7 +950,7 @@ static int unix_setsockopt(struct socket *sock, int lev= el, int optname, switch (optname) { case SO_INQ: if (sk->sk_type !=3D SOCK_STREAM) - return -EINVAL; + return -ENOPROTOOPT; =20 if (val > 1 || val < 0) return -EINVAL; @@ -1006,6 +1006,7 @@ static const struct proto_ops unix_dgram_ops =3D { #endif .listen =3D sock_no_listen, .shutdown =3D unix_shutdown, + .setsockopt =3D unix_setsockopt, .sendmsg =3D unix_dgram_sendmsg, .read_skb =3D unix_read_skb, .recvmsg =3D unix_dgram_recvmsg, @@ -1030,6 +1031,7 @@ static const struct proto_ops unix_seqpacket_ops =3D { #endif .listen =3D unix_listen, .shutdown =3D unix_shutdown, + .setsockopt =3D unix_setsockopt, .sendmsg =3D unix_seqpacket_sendmsg, .recvmsg =3D unix_seqpacket_recvmsg, .mmap =3D sock_no_mmap, @@ -1143,9 +1145,10 @@ static int unix_create(struct net *net, struct socke= t *sock, int protocol, if (protocol && protocol !=3D PF_UNIX) return -EPROTONOSUPPORT; =20 + set_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags); + switch (sock->type) { case SOCK_STREAM: - set_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags); sock->ops =3D &unix_stream_ops; break; /* @@ -1865,8 +1868,7 @@ static int unix_accept(struct socket *sock, struct so= cket *newsock, skb_free_datagram(sk, skb); wake_up_interruptible(&unix_sk(sk)->peer_wait); =20 - if (tsk->sk_type =3D=3D SOCK_STREAM) - set_bit(SOCK_CUSTOM_SOCKOPT, &newsock->flags); + set_bit(SOCK_CUSTOM_SOCKOPT, &newsock->flags); =20 /* attach accepted sock to socket */ unix_state_lock(tsk); --=20 2.55.0 From nobody Tue Sep 29 02:02:55 2026 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40A1048CD7C for ; Thu, 13 Aug 2026 16:30:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786638627; cv=none; b=O8VzeP71RJnHcvNyJPC5zukvHILbT0XADLv3vkn8pPDE/8V2v+YAx+xgh70sk6u69ge6gagli7xSS0958j+/5cgkKrukkYyBz5W+TvVwY6E8R4ACOFANQ5J2j9CK3xtEFgQEsezpVnHEfbdUJEkQ6MQbfgadntU9acuJkrKblJU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786638627; c=relaxed/simple; bh=QJQE/GXd0K169a8mwkplKKdkmQ5sBJfTjp2LDq9OYG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GcrnuhmD7iwG247Q+IxOdj+xDUTqs1wNlEdX80NKzr5B68flO3LJvB8G2iDeIJGCpEezIRXJ2DiUcadH6NHYNb9Vm5BgtOUHtf8NahoEOWwXHnCTYloh2EFYbTSbcO6iR1OqG1g/af8HQamrYo5fVQKWwwly4hzFtcI4+4Esqhg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=Ui8VzVTV; arc=none smtp.client-ip=195.121.94.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="Ui8VzVTV" X-KPN-MessageId: 2086fad7-9734-11f1-861c-005056aba152 Received: from smtp.kpnmail.nl (unknown [10.31.155.39]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id 2086fad7-9734-11f1-861c-005056aba152; Thu, 13 Aug 2026 18:29:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=jTewONXvFxgGhvbpYUlhsacZJwkbZKyIKe17J6I4b48=; b=Ui8VzVTVYXoSx4gljpDJhVvy0r0YXSYtKCq1OzhXDJUUZS2r9vU8Mmsv/NeoKsbpEEJK7LJrgbUkR sewS/9pSm0C/sJ74U63UpcRL9cVGWzFtAIjNyxzoOPut+LaUI+1PRQdB2Q6fshQZTfVmVSCHNYyaIc VNywoJyglO/kjpV/Swm2L2onM2L0C43Yj2ZMxfxTYgimT3QUN7LOzbUVQEdW5X0UO0fkKFR7Zr3gvd W4Q3bXRH/cItClrLnjeUKfYtzEEkxp30pHlg9X3bSPyWyIB6syR6hXnhKX9W2tgtuqC07vt2BqR058 3EwkTjNmm9wlI5v67MUuSnC9OgT0gbQ== X-KPN-MID: 33|/TCCuN7hhmGA3NIotZ7mGUrPFVguPZBlcytE2VY1H+fBBaNzJJ/qgToCc5mc5jz R5tL1fe8/VQJRmodjIbnqe7yJ5MnDFu9Jkw/pRYpXVY4= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|SUsaept8WAFZMntZOpPXVEVPMCkNMqQMUNLNMl52nPuS26v5dKxCmHODWAv1dXY 5dN1kWD9Bmc/WYSRLm7puXw== Received: from fedora (unknown [223.38.86.53]) by smtp.xs4all.nl (Halon) with ESMTPSA id 1b71ed0b-9734-11f1-a8bc-005056ab7447; Thu, 13 Aug 2026 18:29:15 +0200 (CEST) From: Jori Koolstra To: brauner@kernel.org, cyphar@cyphar.com, kuniyu@google.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org Cc: netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, jkoolstra@xs4all.nl Subject: [PATCH net-next v7 2/4] net: scm: move scm_detach_fds() from common path to scm_recv_unix() Date: Thu, 13 Aug 2026 12:28:16 -0400 Message-ID: <20260813162818.149248-3-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260813162818.149248-1-jkoolstra@xs4all.nl> References: <20260813162818.149248-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" scm->fp can only be set when using UNIX sockets, therefore we should move it out of the common path __scm_recv_common() into scm_recv_unix(). Reviewed-by: Kuniyuki Iwashima Signed-off-by: Jori Koolstra --- net/core/scm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/scm.c b/net/core/scm.c index eec13f50ecaf..a73b1eb30fd2 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -523,9 +523,6 @@ static bool __scm_recv_common(struct sock *sk, struct m= sghdr *msg, =20 scm_passec(sk, msg, scm); =20 - if (scm->fp) - scm_detach_fds(msg, scm); - return true; } =20 @@ -545,6 +542,9 @@ void scm_recv_unix(struct socket *sock, struct msghdr *= msg, if (!__scm_recv_common(sock->sk, msg, scm, flags)) return; =20 + if (scm->fp) + scm_detach_fds(msg, scm); + if (sock->sk->sk_scm_pidfd) scm_pidfd_recv(msg, scm); =20 --=20 2.55.0 From nobody Tue Sep 29 02:02:55 2026 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.168]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 349B140626C for ; Thu, 13 Aug 2026 16:29:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.168 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786638571; cv=none; b=Ibz2lzfwa2HA3Byz4ErI/gYxg0g6OM66GBr8fO6zyLm3uF1Qtw1mXtU6C2btKQAldC3V0GzhWGMdITodGuPKoCuhCs8NN7ekFI/F33uMtJTI2oya/wljZE1efMj6GZll7uz+nIPIf5IG1TWXHjsRWb2c8XiGM/pAggPyfR/G6AE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786638571; c=relaxed/simple; bh=pt2sOuaw8jE6TfZBM/FjMhKyPfIULblHNQmIKDM/kLY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OCrr887lE8+B6hQCClEd9K1Z2QxNZ7C5ScJQ+mlB9XW7w1CNlB0Ji3nreuCFE28G/CeABpEgp7qT70/8y1mqXoXSPr6NdkM993+xvlNp1KRnHja3lB/6zM0b5YCIGIkUrk7TeryaBdWKYW1yqeRB3NtMXbfL/bDBvViBXKkqEk8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=d1NyhgpK; arc=none smtp.client-ip=195.121.94.168 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="d1NyhgpK" X-KPN-MessageId: 25b3eeeb-9734-11f1-861c-005056aba152 Received: from smtp.kpnmail.nl (unknown [10.31.155.39]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id 25b3eeeb-9734-11f1-861c-005056aba152; Thu, 13 Aug 2026 18:29:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=yL30R/LcCcOf5aZb8f59fMTnoABl4wBQ0OwwFUfGlHc=; b=d1NyhgpKkpChCdHZz8oJBsdEkQLAfwgB250CdhfIno3B9dIv8U40dFb1A5F8bzIUQSm3RWkNQOP1l jGCis0l+VnE4FJk9eeqLsQ6icLvwcnRRJjN+znXzZnVqE5MWdgrkyg2B/vijNvf0fovQoker9MDJyh +dA2i2slm6C2l4mxVCjQaxNyLwfg4OMAGfmD2I0pEni8TCcUF7tnjS/UgbvkOniyGDFDUiUqVJw6Ml 81pu2vNN/O2oTZV1gW4npgs9WnTvHhJ6ChitqWMbt09It4V+wGKcoY1yAC23tzvjW+xJMIaO4UujrK 13LZkvcWwVUZ1wikkjJa7EDKNZ4c+Fg== X-KPN-MID: 33|XYUkJ0dSNcGnwjPY2WHkutC7y9RmxezALpx2ASUq03ncxUzAncMWUFluPjnRjCc A8MCqDwqsQhzhgICLjjDD0f2VwvwhqdNES6fpy08T56Y= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|TY6+x8ajI1s4BPV3zq32Q7oyXCTs0TM7oscJRIYZLpYUUsrVJGL3AWiwjgPhk8P r/2fib8W13cz8dV4HZU9rQQ== Received: from fedora (unknown [223.38.86.53]) by smtp.xs4all.nl (Halon) with ESMTPSA id 2108a53b-9734-11f1-a8bc-005056ab7447; Thu, 13 Aug 2026 18:29:24 +0200 (CEST) From: Jori Koolstra To: brauner@kernel.org, cyphar@cyphar.com, kuniyu@google.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org Cc: netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, jkoolstra@xs4all.nl Subject: [PATCH net-next v7 3/4] net: af_unix: useful handling of LSM denials on SCM_RIGHTS Date: Thu, 13 Aug 2026 12:28:17 -0400 Message-ID: <20260813162818.149248-4-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260813162818.149248-1-jkoolstra@xs4all.nl> References: <20260813162818.149248-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Right now if some LSM such as Smack denies an AF_UNIX socket peer to receive an SCM_RIGHTS fd, the SCM_RIGHTS fd array will be cut short at that point, and MSG_CTRUNC is set on return of recvmsg(). This is highly problematic behaviour, because it leaves the receiver wondering what happened. As per man page MSG_CTRUNC is supposed to indicate that the control buffer was sized too short, but suddenly a permission error might result in the exact same flag being set. Moreover, the receiver has no chance to determine how many fds got originally sent and how many were suppressed.[1] Add a SO_RIGHTS_NOTRUNC option to UNIX sockets to enable more useful handling of LSM denials when receiving SCM_RIGHTS messages: instead of truncating the message at the first blocked fd, keep every fd slot and store the LSM errno in the blocked slot. The socket option is inherited by the child accept() socket if set on the listen() socket. [1]: https://github.com/uapi-group/kernel-features#useful-handling-of-lsm-d= enials-on-scm_rights Reviewed-by: Christian Brauner (Amutable) Signed-off-by: Jori Koolstra --- arch/alpha/include/uapi/asm/socket.h | 2 ++ arch/mips/include/uapi/asm/socket.h | 2 ++ arch/parisc/include/uapi/asm/socket.h | 2 ++ arch/sparc/include/uapi/asm/socket.h | 2 ++ include/net/af_unix.h | 1 + include/net/scm.h | 13 +++------ include/uapi/asm-generic/socket.h | 2 ++ net/compat.c | 4 +-- net/core/scm.c | 38 +++++++++++++++++++++++---- net/unix/af_unix.c | 12 ++++++++- 10 files changed, 61 insertions(+), 17 deletions(-) diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi= /asm/socket.h index 5ef57f88df6b..946a5fad2691 100644 --- a/arch/alpha/include/uapi/asm/socket.h +++ b/arch/alpha/include/uapi/asm/socket.h @@ -155,6 +155,8 @@ #define SO_INQ 84 #define SCM_INQ SO_INQ =20 +#define SO_RIGHTS_NOTRUNC 85 + #if !defined(__KERNEL__) =20 #if __BITS_PER_LONG =3D=3D 64 diff --git a/arch/mips/include/uapi/asm/socket.h b/arch/mips/include/uapi/a= sm/socket.h index 72fb1b006da9..f1641dde135f 100644 --- a/arch/mips/include/uapi/asm/socket.h +++ b/arch/mips/include/uapi/asm/socket.h @@ -166,6 +166,8 @@ #define SO_INQ 84 #define SCM_INQ SO_INQ =20 +#define SO_RIGHTS_NOTRUNC 85 + #if !defined(__KERNEL__) =20 #if __BITS_PER_LONG =3D=3D 64 diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/ua= pi/asm/socket.h index c16ec36dfee6..f3a3815c7dc2 100644 --- a/arch/parisc/include/uapi/asm/socket.h +++ b/arch/parisc/include/uapi/asm/socket.h @@ -147,6 +147,8 @@ #define SO_INQ 0x4052 #define SCM_INQ SO_INQ =20 +#define SO_RIGHTS_NOTRUNC 0x4053 + #if !defined(__KERNEL__) =20 #if __BITS_PER_LONG =3D=3D 64 diff --git a/arch/sparc/include/uapi/asm/socket.h b/arch/sparc/include/uapi= /asm/socket.h index 71befa109e1c..7907f3b1f0ee 100644 --- a/arch/sparc/include/uapi/asm/socket.h +++ b/arch/sparc/include/uapi/asm/socket.h @@ -148,6 +148,8 @@ #define SO_INQ 0x005d #define SCM_INQ SO_INQ =20 +#define SO_RIGHTS_NOTRUNC 0x005e + #if !defined(__KERNEL__) =20 =20 diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 34f53dde65ce..bb1b3dee02e8 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -49,6 +49,7 @@ struct unix_sock { struct scm_stat scm_stat; int inq_len; bool recvmsg_inq; + bool scm_rights_notrunc; #if IS_ENABLED(CONFIG_AF_UNIX_OOB) struct sk_buff *oob_skb; #endif diff --git a/include/net/scm.h b/include/net/scm.h index c52519669349..86ae6bc109ec 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -50,8 +50,8 @@ struct scm_cookie { #endif }; =20 -void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm); -void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm); +void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm, bool notru= nc); +void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm, boo= l notrunc); int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie = *scm); void __scm_destroy(struct scm_cookie *scm); struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl); @@ -107,13 +107,8 @@ void scm_recv(struct socket *sock, struct msghdr *msg, void scm_recv_unix(struct socket *sock, struct msghdr *msg, struct scm_cookie *scm, int flags); =20 -static inline int scm_recv_one_fd(struct file *f, int __user *ufd, - unsigned int flags) -{ - if (!ufd) - return -EFAULT; - return receive_fd(f, ufd, flags); -} +int scm_recv_one_fd(struct file *f, int __user *ufd, unsigned int flags, + bool notrunc); =20 #endif /* __LINUX_NET_SCM_H */ =20 diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/s= ocket.h index 53b5a8c002b1..84ea7b92936e 100644 --- a/include/uapi/asm-generic/socket.h +++ b/include/uapi/asm-generic/socket.h @@ -150,6 +150,8 @@ #define SO_INQ 84 #define SCM_INQ SO_INQ =20 +#define SO_RIGHTS_NOTRUNC 85 + #if !defined(__KERNEL__) =20 #if __BITS_PER_LONG =3D=3D 64 || (defined(__x86_64__) && defined(__ILP32__= )) diff --git a/net/compat.c b/net/compat.c index d68cf9c3aad5..6bdf4a2c9077 100644 --- a/net/compat.c +++ b/net/compat.c @@ -286,7 +286,7 @@ static int scm_max_fds_compat(struct msghdr *msg) return (msg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int= ); } =20 -void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm) +void scm_detach_fds_compat(struct msghdr *msg, struct scm_cookie *scm, boo= l notrunc) { struct compat_cmsghdr __user *cm =3D (struct compat_cmsghdr __user *)msg->msg_control_user; @@ -296,7 +296,7 @@ void scm_detach_fds_compat(struct msghdr *msg, struct s= cm_cookie *scm) int err =3D 0, i; =20 for (i =3D 0; i < fdmax; i++) { - err =3D scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags); + err =3D scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags, notrunc); if (err < 0) break; } diff --git a/net/core/scm.c b/net/core/scm.c index a73b1eb30fd2..f0d44ecdb11f 100644 --- a/net/core/scm.c +++ b/net/core/scm.c @@ -351,7 +351,31 @@ static int scm_max_fds(struct msghdr *msg) return (msg->msg_controllen - sizeof(struct cmsghdr)) / sizeof(int); } =20 -void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm) +int scm_recv_one_fd(struct file *f, int __user *ufd, unsigned int flags, + bool notrunc) +{ + int error; + + if (!ufd) + return -EFAULT; + + error =3D security_file_receive(f); + if (error) + return notrunc ? put_user(error, ufd) : error; + + FD_PREPARE(fdf, flags, get_file(f)); + if (fdf.err) + return fdf.err; + + error =3D put_user(fd_prepare_fd(fdf), ufd); + if (error) + return error; + + __receive_sock(fd_prepare_file(fdf)); + return fd_publish(fdf); +} + +void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm, bool notru= nc) { struct cmsghdr __user *cm =3D (__force struct cmsghdr __user *)msg->msg_control_user; @@ -365,12 +389,12 @@ void scm_detach_fds(struct msghdr *msg, struct scm_co= okie *scm) return; =20 if (msg->msg_flags & MSG_CMSG_COMPAT) { - scm_detach_fds_compat(msg, scm); + scm_detach_fds_compat(msg, scm, notrunc); return; } =20 for (i =3D 0; i < fdmax; i++) { - err =3D scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags); + err =3D scm_recv_one_fd(scm->fp->fp[i], cmsg_data + i, o_flags, notrunc); if (err < 0) break; } @@ -542,8 +566,12 @@ void scm_recv_unix(struct socket *sock, struct msghdr = *msg, if (!__scm_recv_common(sock->sk, msg, scm, flags)) return; =20 - if (scm->fp) - scm_detach_fds(msg, scm); + if (scm->fp) { + struct unix_sock *u; + + u =3D unix_sk(sock->sk); + scm_detach_fds(msg, scm, READ_ONCE(u->scm_rights_notrunc)); + } =20 if (sock->sk->sk_scm_pidfd) scm_pidfd_recv(msg, scm); diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 51cbf920130d..5c0549e6784f 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -922,6 +922,7 @@ static bool unix_custom_sockopt(int optname) { switch (optname) { case SO_INQ: + case SO_RIGHTS_NOTRUNC: return true; default: return false; @@ -957,6 +958,14 @@ static int unix_setsockopt(struct socket *sock, int le= vel, int optname, =20 WRITE_ONCE(u->recvmsg_inq, val); break; + + case SO_RIGHTS_NOTRUNC: + if (val > 1 || val < 0) + return -EINVAL; + + WRITE_ONCE(u->scm_rights_notrunc, val); + break; + default: return -ENOPROTOOPT; } @@ -1746,9 +1755,10 @@ static int unix_stream_connect(struct socket *sock, = struct sockaddr_unsized *uad init_peercred(newsk, &peercred); =20 newu =3D unix_sk(newsk); + otheru =3D unix_sk(other); newu->listener =3D other; + newu->scm_rights_notrunc =3D READ_ONCE(otheru->scm_rights_notrunc); RCU_INIT_POINTER(newsk->sk_wq, &newu->peer_wq); - otheru =3D unix_sk(other); =20 /* copy address information from listening to new sock * --=20 2.55.0 From nobody Tue Sep 29 02:02:55 2026 Received: from ewsoutbound.kpnmail.nl (ewsoutbound.kpnmail.nl [195.121.94.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C215471272 for ; Fri, 14 Aug 2026 17:29:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.121.94.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786728578; cv=none; b=Bir7/j0dywuJeI3YRKdbFiq8XE9sJZkT5ppDThUVZesvrcM0al0k3BwdV2VXa7ntxbJgYf4K+ovsBhRy4ncuAattDA34WZ2Pf00lPHmGYsBSeqpc1tPT2XRaZF2N8ZiMxQ0CBquZi1wDDIUD6xBk3bDydbtwEihxcTXeD2tXlYM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786728578; c=relaxed/simple; bh=qRP6Fzrjzx581TLe+ODwZowV0EVL4ovgm7DtoSn/IK0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N4GrvyCfzGXVrz6lpH2LnBRS5t+jmPBeuhRqa+xAvg6EpleJgyDEipb4HIUTJnJpAvK6HuXG2m+hdcykYpFe6qYcM/zDmkafb1Ifl8AA4ljrqdGCXTjxRcoIo1Dus3oVUKw2zr+1cACdb18hIIVg4TVWhncFPfFCYnFUh2EK258= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl; spf=pass smtp.mailfrom=xs4all.nl; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b=KGLCyum5; arc=none smtp.client-ip=195.121.94.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xs4all.nl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=xs4all.nl header.i=@xs4all.nl header.b="KGLCyum5" X-KPN-MessageId: b39acb9e-9805-11f1-bfbb-00505699b430 Received: from smtp.kpnmail.nl (unknown [10.31.155.8]) by ewsoutbound.so.kpn.org (Halon) with ESMTPS id b39acb9e-9805-11f1-bfbb-00505699b430; Fri, 14 Aug 2026 19:29:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=xs4all01; h=mime-version:message-id:date:subject:to:from; bh=yuhW5fo8gy1KkAMB4l09VmCtFZcOuXgv/fiRdg5ZL1E=; b=KGLCyum53+XmV5S6ATj7uHO9TLhn2Kn0gS4xKSiVEFVp0WbEbLX2cPwDX9ELqy4KrjyncWeDXUnek coJXce0CddFWuxfq1e8fLrmQTgzhk0/YF+qUH+4q80oWHBMteNY2E5Ivla2s19vKbrEmQwdK/QW1Nm KFzF+0cFi7v5qyqXbDp9jm44nsqx4OngRBK2eCMkaoZo9x0jC3y5+Nmtt9voX+alQ50t5itUpGJcv2 e1Y2VjhHa8xJWZ536SWEytjPwWV1YMfMrEZ5vppH+t4s3S7GM9nmJWD8Ur/QLTIVDp+fsaJcXtcmRO IuiNy1hhYdd3gVGZvUVSUBQCgcsZSCA== X-KPN-MID: 33|z2VfLob3x0ZwACcXMDEtiWbjkvvHAVYu/HytlrEhyimL1vnwAJ/bD6LRSGFc97t 7xAMk/dNHaT3Pa/rrSOnH8JeK0GYXaY0b3u9ye8x0wAQ= X-KPN-VerifiedSender: Yes X-CMASSUN: 33|V/RJD6lPIMVNghFN/+E8FZFhK/71A3hofhx5fDF61az3ubWBpgh5s9Xx2qrKUYb USXWJhGcxb4jNuOletpvRBQ== Received: from fedora (unknown [27.1.3.178]) by smtp.xs4all.nl (Halon) with ESMTPSA id 906404dc-9805-11f1-8ddb-00505699d6e5; Fri, 14 Aug 2026 19:29:25 +0200 (CEST) From: Jori Koolstra To: brauner@kernel.org, cyphar@cyphar.com, kuniyu@google.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org Cc: netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, jkoolstra@xs4all.nl Subject: [PATCH net-next v7 4/4] selftest: Add tests for useful handling of LSM denials on SCM_RIGHTS Date: Fri, 14 Aug 2026 13:28:06 -0400 Message-ID: <20260814172806.158954-1-jkoolstra@xs4all.nl> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260813162818.149248-1-jkoolstra@xs4all.nl> References: <20260813162818.149248-1-jkoolstra@xs4all.nl> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Tests SCM_RIGHTS fd passing on a socket with the new socket option SO_RIGHTS_NOTRUNC turned on. To hook into the security_file_receive() call, BPF is used. The BPF program shares a hashmap with userspace that lists the inos to be blocked (of the receiver tgid). Signed-off-by: Jori Koolstra --- .../testing/selftests/net/af_unix/.gitignore | 2 + tools/testing/selftests/net/af_unix/Makefile | 8 + tools/testing/selftests/net/af_unix/config | 7 + .../net/af_unix/scm_rights_denial_lsm.bpf.c | 36 +++ .../net/af_unix/scm_rights_denial_lsm.c | 292 ++++++++++++++++++ 5 files changed, 345 insertions(+) create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial_l= sm.bpf.c create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial_l= sm.c diff --git a/tools/testing/selftests/net/af_unix/.gitignore b/tools/testing= /selftests/net/af_unix/.gitignore index 973176644103..954f0958dd03 100644 --- a/tools/testing/selftests/net/af_unix/.gitignore +++ b/tools/testing/selftests/net/af_unix/.gitignore @@ -3,6 +3,8 @@ msg_oob scm_inq scm_pidfd scm_rights +scm_rights_denial_lsm +scm_rights_denial_lsm.bpf.o so_peek_off unix_connect unix_connreset diff --git a/tools/testing/selftests/net/af_unix/Makefile b/tools/testing/s= elftests/net/af_unix/Makefile index 57d159803a3a..a66f10fb0c23 100644 --- a/tools/testing/selftests/net/af_unix/Makefile +++ b/tools/testing/selftests/net/af_unix/Makefile @@ -11,10 +11,18 @@ TEST_GEN_PROGS :=3D \ scm_inq \ scm_pidfd \ scm_rights \ + scm_rights_denial_lsm \ so_peek_off \ unix_connect \ unix_connreset \ unix_listen \ # end of TEST_GEN_PROGS =20 +TEST_GEN_FILES :=3D scm_rights_denial_lsm.bpf.o + include ../../lib.mk +include ../bpf.mk + +$(OUTPUT)/scm_rights_denial_lsm: $(BPFOBJ) +$(OUTPUT)/scm_rights_denial_lsm: CFLAGS +=3D -I$(SCRATCH_DIR)/include +$(OUTPUT)/scm_rights_denial_lsm: LDLIBS +=3D -lelf -lz diff --git a/tools/testing/selftests/net/af_unix/config b/tools/testing/sel= ftests/net/af_unix/config index 41dbb03c747e..46450fea8407 100644 --- a/tools/testing/selftests/net/af_unix/config +++ b/tools/testing/selftests/net/af_unix/config @@ -1,4 +1,11 @@ CONFIG_AF_UNIX_OOB=3Dy +CONFIG_BPF=3Dy +CONFIG_BPF_EVENTS=3Dy +CONFIG_BPF_JIT=3Dy +CONFIG_BPF_LSM=3Dy +CONFIG_BPF_SYSCALL=3Dy +CONFIG_DEBUG_INFO_BTF=3Dy +CONFIG_SECURITY=3Dy CONFIG_UNIX=3Dy CONFIG_UNIX_DIAG=3Dm CONFIG_USER_NS=3Dy diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.bpf.= c b/tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.bpf.c new file mode 100644 index 000000000000..4f2414465bfd --- /dev/null +++ b/tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.bpf.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include +#include + +char _license[] SEC("license") =3D "GPL"; + +struct inode { + unsigned long i_ino; +} __attribute__((preserve_access_index)); + +struct file { + struct inode *f_inode; +} __attribute__((preserve_access_index)); + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(max_entries, 16); + __type(key, __u64); /* inode number */ + __type(value, __u32); /* tgid of the receiver being tested */ +} denied_inodes SEC(".maps"); + +SEC("lsm/file_receive") +int BPF_PROG(scm_rights_deny, struct file *file) +{ + __u32 tgid =3D bpf_get_current_pid_tgid() >> 32; + __u64 ino =3D file->f_inode->i_ino; + __u32 *owner; + + owner =3D bpf_map_lookup_elem(&denied_inodes, &ino); + if (owner && *owner =3D=3D tgid) + return -EPERM; + + return 0; +} diff --git a/tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.c b/= tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.c new file mode 100644 index 000000000000..55c7ecdbb5fe --- /dev/null +++ b/tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.c @@ -0,0 +1,292 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "kselftest_harness.h" + +#ifndef SO_RIGHTS_NOTRUNC +#define SO_RIGHTS_NOTRUNC 85 +#endif + +#define NR_FILES 2 + +/* Per-file content, so a received fd can be matched to the file sent */ +#define SECRET(n) "secret %d", (n) + +/* Indices into the socketpair */ +#define SK_SENDER 0 +#define SK_RECEIVER 1 + +FIXTURE(scm_rights_denial_bpf) +{ + struct bpf_object *obj; + struct bpf_link *link; + int map_fd; + int sk[2]; + int files[NR_FILES]; + __u64 inos[NR_FILES]; + char paths[NR_FILES][64]; +}; + +FIXTURE_VARIANT(scm_rights_denial_bpf) +{ + int sock_type; +}; + +FIXTURE_VARIANT_ADD(scm_rights_denial_bpf, stream) +{ + .sock_type =3D SOCK_STREAM, +}; + +FIXTURE_VARIANT_ADD(scm_rights_denial_bpf, dgram) +{ + .sock_type =3D SOCK_DGRAM, +}; + +FIXTURE_VARIANT_ADD(scm_rights_denial_bpf, seqpacket) +{ + .sock_type =3D SOCK_SEQPACKET, +}; + +FIXTURE_SETUP(scm_rights_denial_bpf) +{ + struct bpf_program *prog; + char lsms[256] =3D {}; + int i, fd; + + if (geteuid() !=3D 0) + SKIP(return, "requires root"); + + fd =3D open("/sys/kernel/security/lsm", O_RDONLY); + ASSERT_GE(fd, 0); + ASSERT_LT(0, read(fd, lsms, sizeof(lsms) - 1)); + close(fd); + + if (!strstr(lsms, "bpf")) + SKIP(return, "BPF LSM not active (boot with lsm=3D...,bpf)"); + + self->obj =3D bpf_object__open_file("scm_rights_denial_lsm.bpf.o", NULL); + ASSERT_NE(NULL, self->obj); + ASSERT_EQ(0, bpf_object__load(self->obj)); + + prog =3D bpf_object__find_program_by_name(self->obj, "scm_rights_deny"); + ASSERT_NE(NULL, prog); + + self->link =3D bpf_program__attach_lsm(prog); + ASSERT_NE(NULL, self->link); + + self->map_fd =3D bpf_object__find_map_fd_by_name(self->obj, + "denied_inodes"); + ASSERT_GE(self->map_fd, 0); + + ASSERT_EQ(0, socketpair(AF_UNIX, variant->sock_type, 0, self->sk)); + + for (i =3D 0; i < NR_FILES; i++) { + struct stat st; + + snprintf(self->paths[i], sizeof(self->paths[i]), + "/tmp/scm_rights_denial_bpf.%d.XXXXXX", i); + self->files[i] =3D mkstemp(self->paths[i]); + ASSERT_GE(self->files[i], 0); + + ASSERT_LT(0, dprintf(self->files[i], SECRET(i))); + + ASSERT_EQ(0, fstat(self->files[i], &st)); + self->inos[i] =3D st.st_ino; + } +} + +FIXTURE_TEARDOWN(scm_rights_denial_bpf) +{ + bpf_link__destroy(self->link); + bpf_object__close(self->obj); + + for (int i =3D 0; i < NR_FILES; i++) { + if (self->files[i] >=3D 0) { + close(self->files[i]); + unlink(self->paths[i]); + } + } + + close(self->sk[SK_SENDER]); + close(self->sk[SK_RECEIVER]); +} + +static int deny_inode(int map_fd, __u64 ino) +{ + __u32 tgid =3D getpid(); + + return bpf_map_update_elem(map_fd, &ino, &tgid, BPF_ANY); +} + +static int set_notrunc(int sk) +{ + int one =3D 1; + + return setsockopt(sk, SOL_SOCKET, SO_RIGHTS_NOTRUNC, + &one, sizeof(one)); +} + +static int send_fds(int sk, int *fds, int n) +{ + char ctrl[CMSG_SPACE(NR_FILES * sizeof(int))] =3D {}; + char data =3D 'x'; + struct iovec iov =3D { + .iov_base =3D &data, + .iov_len =3D sizeof(data), + }; + struct msghdr msg =3D { + .msg_iov =3D &iov, + .msg_iovlen =3D 1, + .msg_control =3D ctrl, + .msg_controllen =3D CMSG_SPACE(n * sizeof(int)), + }; + struct cmsghdr *cmsg =3D CMSG_FIRSTHDR(&msg); + int ret; + + cmsg->cmsg_level =3D SOL_SOCKET; + cmsg->cmsg_type =3D SCM_RIGHTS; + cmsg->cmsg_len =3D CMSG_LEN(n * sizeof(int)); + memcpy(CMSG_DATA(cmsg), fds, n * sizeof(int)); + + ret =3D sendmsg(sk, &msg, 0); + if (ret !=3D 1) + return -1; + + return 0; +} + +static int recv_fd_slots(int sk, int *slots, int *msg_flags) +{ + int nr_slots; + char ctrl[CMSG_SPACE(NR_FILES * sizeof(int))]; + char data; + struct iovec iov =3D { + .iov_base =3D &data, + .iov_len =3D sizeof(data), + }; + struct msghdr msg =3D { + .msg_iov =3D &iov, + .msg_iovlen =3D 1, + .msg_control =3D ctrl, + .msg_controllen =3D sizeof(ctrl), + }; + struct cmsghdr *cmsg; + + if (recvmsg(sk, &msg, 0) < 0) + return -1; + + *msg_flags =3D msg.msg_flags; + + cmsg =3D CMSG_FIRSTHDR(&msg); + if (!cmsg) + return 0; + + nr_slots =3D (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int); + memcpy(slots, CMSG_DATA(cmsg), nr_slots * sizeof(int)); + + return nr_slots; +} + +/* Prove a received fd works by reading back the file's content. */ +static int check_secret(int fd, int idx) +{ + char want[32], got[32] =3D {}; + + snprintf(want, sizeof(want), SECRET(idx)); + if (pread(fd, got, sizeof(got) - 1, 0) < 0) + return -1; + + return strcmp(want, got); +} + +TEST_F(scm_rights_denial_bpf, all_allowed) +{ + int slots[NR_FILES], nr_slots, flags; + + ASSERT_EQ(0, set_notrunc(self->sk[SK_RECEIVER])); + ASSERT_EQ(0, send_fds(self->sk[SK_SENDER], self->files, NR_FILES)); + nr_slots =3D recv_fd_slots(self->sk[SK_RECEIVER], slots, &flags); + + ASSERT_EQ(NR_FILES, nr_slots); + EXPECT_EQ(0, flags & MSG_CTRUNC); + + for (int i =3D 0; i < nr_slots; i++) { + ASSERT_GE(slots[i], 0); + EXPECT_EQ(0, check_secret(slots[i], i)); + close(slots[i]); + } +} + +TEST_F(scm_rights_denial_bpf, first_denied) +{ + int slots[NR_FILES], nr_slots, flags; + + ASSERT_EQ(0, deny_inode(self->map_fd, self->inos[0])); + + ASSERT_EQ(0, set_notrunc(self->sk[SK_RECEIVER])); + ASSERT_EQ(0, send_fds(self->sk[SK_SENDER], self->files, NR_FILES)); + nr_slots =3D recv_fd_slots(self->sk[SK_RECEIVER], slots, &flags); + + ASSERT_EQ(NR_FILES, nr_slots); + EXPECT_EQ(0, flags & MSG_CTRUNC); +=09 + EXPECT_EQ(-EPERM, slots[0]); + for (int i =3D 1; i < nr_slots; i++) { + ASSERT_GE(slots[i], 0); + EXPECT_EQ(0, check_secret(slots[i], i)); + close(slots[i]); + } +} + +TEST_F(scm_rights_denial_bpf, all_denied) +{ + int slots[NR_FILES], nr_slots, flags, i; + + for (i =3D 0; i < NR_FILES; i++) + ASSERT_EQ(0, deny_inode(self->map_fd, self->inos[i])); + + ASSERT_EQ(0, set_notrunc(self->sk[SK_RECEIVER])); + ASSERT_EQ(0, send_fds(self->sk[SK_SENDER], self->files, NR_FILES)); + nr_slots =3D recv_fd_slots(self->sk[SK_RECEIVER], slots, &flags); + + ASSERT_EQ(NR_FILES, nr_slots); + EXPECT_EQ(0, flags & MSG_CTRUNC); + + for (i =3D 0; i < nr_slots; i++) + EXPECT_EQ(-EPERM, slots[i]); +} + +TEST_F(scm_rights_denial_bpf, denied_without_notrunc) +{ + int slots[NR_FILES], nr_slots, flags; + + /* + * Baseline behaviour without SO_RIGHTS_NOTRUNC: the fd array is + * truncated at the first denied fd and MSG_CTRUNC is set. + */ + ASSERT_EQ(0, deny_inode(self->map_fd, self->inos[1])); + + ASSERT_EQ(0, send_fds(self->sk[SK_SENDER], self->files, NR_FILES)); + nr_slots =3D recv_fd_slots(self->sk[SK_RECEIVER], slots, &flags); + + ASSERT_EQ(1, nr_slots); + EXPECT_NE(0, flags & MSG_CTRUNC); + + ASSERT_GE(slots[0], 0); + EXPECT_EQ(0, check_secret(slots[0], 0)); + close(slots[0]); +} + +TEST_HARNESS_MAIN --=20 2.55.0