From: Rishikesh Jethwani <rjethwani@purestorage.com>
To: netdev@vger.kernel.org
Cc: Jiayuan Chen <jiayuan.chen@linux.dev>,
Eric Dumazet <edumazet@kernel.org>,
Kuniyuki Iwashima <kuniyu@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Willem de Bruijn <willemb@google.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Simon Horman <horms@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Sabrina Dubroca <sd@queasysnail.net>,
Shuah Khan <shuah@kernel.org>, Hannes Reinecke <hare@suse.de>,
Sagi Grimberg <sagi@grimberg.me>,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Rishikesh Jethwani <rjethwani@purestorage.com>
Subject: [PATCH net v3 2/2] selftests: tls: test that TLS and KCM are mutually exclusive
Date: Wed, 28 Oct 2026 11:35:33 -0600 [thread overview]
Message-ID: <20261028173533.2658096-3-rjethwani@purestorage.com> (raw)
In-Reply-To: <20261028173533.2658096-1-rjethwani@purestorage.com>
Cover both orders, with TLS RX and TLS TX on the attach side, and check
that a socket detached from KCM with SIOCKCMUNATTACH can still be
upgraded to TLS.
KCM needs a BPF parser program, so the tests are skipped without
AF_KCM or when the program can't be loaded. Add CONFIG_AF_KCM to the
net selftest config.
Signed-off-by: Rishikesh Jethwani <rjethwani@purestorage.com>
---
tools/testing/selftests/net/config | 1 +
tools/testing/selftests/net/tls.c | 144 +++++++++++++++++++++++++++++
2 files changed, 145 insertions(+)
diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config
index cb8cb4696df7..1619478fffc4 100644
--- a/tools/testing/selftests/net/config
+++ b/tools/testing/selftests/net/config
@@ -1,3 +1,4 @@
+CONFIG_AF_KCM=m
CONFIG_AMT=m
CONFIG_BAREUDP=m
CONFIG_BONDING=m
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c
index 9d3cd4fff062..2e4128e0676a 100644
--- a/tools/testing/selftests/net/tls.c
+++ b/tools/testing/selftests/net/tls.c
@@ -7,19 +7,24 @@
#include <error.h>
#include <fcntl.h>
#include <poll.h>
+#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <linux/bpf.h>
+#include <linux/kcm.h>
#include <linux/tls.h>
#include <linux/tcp.h>
#include <linux/socket.h>
#include <sys/epoll.h>
+#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/sendfile.h>
#include <sys/socket.h>
#include <sys/stat.h>
+#include <sys/syscall.h>
#include "kselftest_harness.h"
@@ -3492,6 +3497,145 @@ TEST(data_steal) {
close(cfd);
}
+#ifndef AF_KCM
+#define AF_KCM 41
+#endif
+
+/* KCM and TLS are mutually exclusive, in either order. */
+FIXTURE(kcm)
+{
+ int fd, cfd, kcm, bpf;
+};
+
+FIXTURE_SETUP(kcm)
+{
+ /* KCM parser: each message is everything queued (skb->len) */
+ struct bpf_insn insns[] = {
+ { .code = BPF_LDX | BPF_MEM | BPF_W, .dst_reg = BPF_REG_0,
+ .src_reg = BPF_REG_1,
+ .off = offsetof(struct __sk_buff, len) },
+ { .code = BPF_JMP | BPF_EXIT },
+ };
+ union bpf_attr attr = {};
+ struct sockaddr_in addr;
+ socklen_t len;
+ int sfd, ret;
+
+ self->fd = -1;
+ self->cfd = -1;
+ self->bpf = -1;
+
+ self->kcm = socket(AF_KCM, SOCK_DGRAM, KCMPROTO_CONNECTED);
+ if (self->kcm < 0)
+ SKIP(return, "no KCM support");
+
+ attr.prog_type = BPF_PROG_TYPE_SOCKET_FILTER;
+ attr.insns = (unsigned long)insns;
+ attr.insn_cnt = ARRAY_SIZE(insns);
+ attr.license = (unsigned long)"GPL";
+ self->bpf = syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr));
+ if (self->bpf < 0)
+ SKIP(return, "can't load KCM parser BPF program");
+
+ len = sizeof(addr);
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ addr.sin_port = 0;
+
+ self->fd = socket(AF_INET, SOCK_STREAM, 0);
+ sfd = socket(AF_INET, SOCK_STREAM, 0);
+
+ ret = bind(sfd, &addr, sizeof(addr));
+ ASSERT_EQ(ret, 0);
+ ret = listen(sfd, 10);
+ ASSERT_EQ(ret, 0);
+ ret = getsockname(sfd, &addr, &len);
+ ASSERT_EQ(ret, 0);
+ ret = connect(self->fd, &addr, sizeof(addr));
+ ASSERT_EQ(ret, 0);
+ self->cfd = accept(sfd, &addr, &len);
+ ASSERT_GE(self->cfd, 0);
+
+ close(sfd);
+}
+
+FIXTURE_TEARDOWN(kcm)
+{
+ close(self->kcm);
+ close(self->bpf);
+ close(self->fd);
+ close(self->cfd);
+}
+
+static int kcm_attach(struct _test_data_kcm *self)
+{
+ struct kcm_attach attach = { .fd = self->cfd, .bpf_fd = self->bpf };
+
+ return ioctl(self->kcm, SIOCKCMATTACH, &attach);
+}
+
+static int kcm_unattach(struct _test_data_kcm *self)
+{
+ struct kcm_unattach unattach = { .fd = self->cfd };
+
+ return ioctl(self->kcm, SIOCKCMUNATTACH, &unattach);
+}
+
+static void kcm_tls_then_attach(struct __test_metadata *_metadata,
+ struct _test_data_kcm *self, int optname)
+{
+ struct tls_crypto_info_keys tls;
+ int ret;
+
+ ret = setsockopt(self->cfd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+ if (ret && errno == ENOENT)
+ SKIP(return, "no TLS support");
+ ASSERT_EQ(ret, 0);
+
+ tls_crypto_info_init(TLS_1_2_VERSION, TLS_CIPHER_AES_GCM_128, &tls, 0);
+ ret = setsockopt(self->cfd, SOL_TLS, optname, &tls, tls.len);
+ ASSERT_EQ(ret, 0);
+
+ EXPECT_EQ(kcm_attach(self), -1);
+ EXPECT_EQ(errno, EOPNOTSUPP);
+}
+
+TEST_F(kcm, tls_rx_then_attach)
+{
+ kcm_tls_then_attach(_metadata, self, TLS_RX);
+}
+
+TEST_F(kcm, tls_tx_then_attach)
+{
+ kcm_tls_then_attach(_metadata, self, TLS_TX);
+}
+
+TEST_F(kcm, attach_then_tls)
+{
+ int ret;
+
+ ASSERT_EQ(kcm_attach(self), 0);
+
+ ret = setsockopt(self->cfd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+ if (ret && errno == ENOENT)
+ SKIP(return, "no TLS support");
+ EXPECT_EQ(ret, -1);
+ EXPECT_EQ(errno, EINVAL);
+}
+
+TEST_F(kcm, tls_after_unattach)
+{
+ int ret;
+
+ ASSERT_EQ(kcm_attach(self), 0);
+ ASSERT_EQ(kcm_unattach(self), 0);
+
+ ret = setsockopt(self->cfd, IPPROTO_TCP, TCP_ULP, "tls", sizeof("tls"));
+ if (ret && errno == ENOENT)
+ SKIP(return, "no TLS support");
+ EXPECT_EQ(ret, 0);
+}
+
static void __attribute__((constructor)) fips_check(void) {
int res;
FILE *f;
--
2.50.1
next prev parent reply other threads:[~2026-10-28 17:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-28 17:35 [PATCH net v3 0/2] kcm: reject the combination of KCM and TLS Rishikesh Jethwani
2026-10-28 17:35 ` [PATCH net v3 1/2] kcm: reject attaching sockets with a ULP, and TLS on KCM sockets Rishikesh Jethwani
2026-10-28 20:41 ` Kuniyuki Iwashima
2026-10-29 3:17 ` Jiayuan Chen
2026-10-28 17:35 ` Rishikesh Jethwani [this message]
2026-10-28 20:43 ` [PATCH net v3 2/2] selftests: tls: test that TLS and KCM are mutually exclusive Kuniyuki Iwashima
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261028173533.2658096-3-rjethwani@purestorage.com \
--to=rjethwani@purestorage.com \
--cc=davem@davemloft.net \
--cc=edumazet@kernel.org \
--cc=hare@suse.de \
--cc=horms@kernel.org \
--cc=jiayuan.chen@linux.dev \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kuniyu@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sagi@grimberg.me \
--cc=sd@queasysnail.net \
--cc=shuah@kernel.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®