From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=220.197.31.5 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058605; b=CzA7EK3q5UQLTfM7A5D+lIaJxHfuk41XCbx6gC5eyXBumGFLxv5iADMcmKeyQkC/KcPQ SPBptru0dUqTREITKBG3WrQVBqGwPQhapxQShtfuTburTf/GvhqfepMDOh9lzFs5ah0Wh 8hn8/GCDjlww5Ho83US31p11n0YRrY8r8R1jhbSByDA79oSMEl+ctnsNTz/nM/g9UqpZa 8ee+LR876G0zSkZhfWxAUlfj99JYdNXhx3Fs96ru/Kdk6jO8cH8xbocUiXJXIlTS5Gz2g 9k7Z/ipTf3gy1fNtaF9PlE8djthKJHdIiFXVFOvha1g5pqMTjvYBuO9ARftFQwWJlaQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058605; h=DMARC-Filter:DKIM-Signature:Received:From:To:Cc:Subject:Date: Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-CM-TRANSID:X-Coremail-Antispam: X-CM-SenderInfo; bh=cHmwptowYKNxL+0rjg4ZbqGuN3Z1jBx3o4VBT2/LBbc=; b=k7+KLMcTeoYfeXaaE2shNjtd1bjenLGTCxk/xIIrMzEPaAkw7v7oEChxxyj3ECqT/P3c qXkwHMu6oQ9wVuR+X80nE9nvJSjSCdC4jUtnvamCaj63o2r7rkkOEKDuAeFsKHM6aPrvE aXEInxS+mQ5kjRfB/lpCg5TYtnUfRoV4EGplR3Af+r2bKMN4NnbRMi1jtmSCtfE17l66x Ipe1xqa+XSKQKCl6vq1cn8ioaDCRbOjo0kNQtoQkVi8AAGkywkZlGBitYrbwPiG25mmT5 stlre5xQS+jmg3GowGXMdfmU6PetAW3FgF/3gwAPc9VTREpf6dfN7TFbWepKT5TTFDQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=a3mhC9Fr; arc=none smtp.remote-ip=220.197.31.5 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 559B9606A326 for ; Thu, 19 Nov 2026 03:23:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 559B9606A326 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=a3mhC9Fr DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=cH mwptowYKNxL+0rjg4ZbqGuN3Z1jBx3o4VBT2/LBbc=; b=a3mhC9FrD/TSe+2oh1 snosx9wiC8iQ7gfjIsp/H8Yy3TbhigHEzIX9tBGxWe9eZs7/pRQiMLSVKO6KGc7m TqQATohLUJ9Nl36T3m49OyGaDv1b4RExP5HI2S5gGlTAtoEC5iw99Tajw/lgrePE cQBlwq5V5wQdoNX7+zQCb/xfU= Received: from localhost.localdomain (unknown []) by gzga-smtp-mtada-g1-0 (Coremail) with SMTP id _____wDHrxGQa_5qYlvqHw--.39351S4; Thu, 19 Nov 2026 11:22:57 +0800 (CST) From: Rongguang Wei To: netdev@vger.kernel.org Cc: willemdebruijn.kernel@gmail.com, jasowangio@gmail.com, andrew+netdev@lunn.ch, davem@davemloft.net, alexei.starovoitov@gmail.com, kuba@kernel.org, Rongguang Wei Subject: [PATCH net v11 2/2] selftests: net: add TAP socket filter attach tests Date: Thu, 19 Nov 2026 11:22:42 +0800 Message-Id: <20261119032242.71919-3-clementwei90@163.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20261119032242.71919-1-clementwei90@163.com> References: <20261119032242.71919-1-clementwei90@163.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_____wDHrxGQa_5qYlvqHw--.39351S4 X-Coremail-Antispam: 1Uf129KBjvJXoW3CF47Jw4DAryxCw17ZF15CFg_yoWktr48pF 97WFWDJr15Xr47Xws7ArW8ZFW3Zw4DGr1rAan5K3s8ZFs8Jry5Ca9YkFWakws7tr48uws0 kFyaya43WwsxtFJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jajgcUUUUU= X-CM-SenderInfo: 5fohzv5qwzvxizq6il2tof0z/xtbC4hFZxGr+a5EdPQAA3g From: Rongguang Wei Add tests for TUNATTACHFILTER and TUNDETACHFILTER: a queue re-attached after the buffer the program came from was made unreadable, a bad program and a bad length with queues attached and with none, a program configured before any queue, and the IFF_NOFILTER paths. Signed-off-by: Rongguang Wei --- tools/testing/selftests/net/tun.c | 358 ++++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) diff --git a/tools/testing/selftests/net/tun.c b/tools/testing/selftests/net/tun.c index 34de2580e32ec..ac326193867b0 100644 --- a/tools/testing/selftests/net/tun.c +++ b/tools/testing/selftests/net/tun.c @@ -9,9 +9,11 @@ #include #include #include +#include #include #include #include +#include #include #include "kselftest_harness.h" @@ -548,6 +550,362 @@ TEST_F(tun, reattach_close_delete) EXPECT_EQ(tun_delete(self->ifname), 0); } +/* accept: return skb->len. Three instructions on purpose, so that the + * length read back through TUNGETFILTER tells it apart from a rejected + * program that is shorter. + */ +static const struct sock_filter filter_accept[] = { + BPF_STMT(BPF_LD | BPF_W | BPF_LEN, 0), + BPF_STMT(BPF_ALU | BPF_ADD | BPF_K, 0), + BPF_STMT(BPF_RET | BPF_A, 0), +}; + +/* Put the instructions in an anonymous mapping, so that the test can make the + * address unreadable afterwards. + */ +static void *filter_alloc(const struct sock_filter *insns, unsigned int len) +{ + void *p; + + p = mmap(NULL, getpagesize(), PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (p == MAP_FAILED) + return NULL; + + memcpy(p, insns, len * sizeof(*insns)); + + return p; +} + +static int filter_attach(int fd, const struct sock_filter *insns, unsigned int len) +{ + struct sock_fprog fp = { + .len = len, + .filter = (struct sock_filter *)insns, + }; + + return ioctl(fd, TUNATTACHFILTER, (void *)&fp); +} + +static int filter_get(int fd, struct sock_fprog *fp) +{ + return ioctl(fd, TUNGETFILTER, (void *)fp); +} + +static int tun_get_iff_flags(int fd) +{ + struct ifreq ifr = { 0 }; + + if (ioctl(fd, TUNGETIFF, (void *)&ifr) < 0) + return -1; + + return ifr.ifr_flags; +} + +/* + * The program is built when TUNATTACHFILTER is issued, so a queue attached + * later does not read the buffer it came from. Here the mapping is made + * unreadable before the queue is attached again, and another queue is then + * attached from a fresh socket, which starts without a filter of its own. + */ +TEST_F(tun, reattach_filter_without_user_buffer) +{ + struct sock_fprog gf = { 0 }; + struct ifreq ifr = { 0 }; + short flags = 0; + void *prog; + int fd, ret; + + prog = filter_alloc(filter_accept, ARRAY_SIZE(filter_accept)); + ASSERT_NE(prog, NULL); + ASSERT_EQ(filter_attach(self->fd, prog, ARRAY_SIZE(filter_accept)), 0); + + EXPECT_EQ(tun_detach(self->fd, self->ifname), 0); + + /* This memory is no longer readable */ + ASSERT_EQ(mprotect(prog, getpagesize(), PROT_NONE), 0); + + ret = tun_attach(self->fd, self->ifname); + EXPECT_EQ(ret, 0); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + /* The queue is attached again, not left disabled */ + EXPECT_EQ(flags & IFF_DETACH_QUEUE, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + /* The two checks below document the expected state, they cannot + * tell an installed filter from no filter: tun_detach() leaves the + * device program alone, and TUNGETFILTER only returns the header. + */ + EXPECT_EQ(filter_get(self->fd, &gf), 0); + EXPECT_EQ(gf.len, ARRAY_SIZE(filter_accept)); + + /* A new queue starts without a filter, so a clear IFF_NOFILTER shows + * that the filter configured on the device covers it as well. + */ + fd = open("/dev/net/tun", O_RDWR); + ASSERT_GE(fd, 0); + + strcpy(ifr.ifr_name, self->ifname); + ifr.ifr_flags = IFF_TAP | IFF_MULTI_QUEUE; + EXPECT_GE(ioctl(fd, TUNSETIFF, (void *)&ifr), 0); + + flags = tun_get_iff_flags(fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + close(fd); + + ASSERT_EQ(mprotect(prog, getpagesize(), PROT_READ | PROT_WRITE), 0); + ASSERT_EQ(munmap(prog, getpagesize()), 0); +} + +/* A new queue attached with IFF_NOFILTER must not get the filter that is + * configured on the device. + */ +TEST_F(tun, attach_filter_nofilter_flag) +{ + struct ifreq ifr = { 0 }; + short flags = 0; + int fd; + + ASSERT_EQ(filter_attach(self->fd, filter_accept, ARRAY_SIZE(filter_accept)), 0); + + fd = open("/dev/net/tun", O_RDWR); + ASSERT_GE(fd, 0); + + strcpy(ifr.ifr_name, self->ifname); + ifr.ifr_flags = IFF_TAP | IFF_MULTI_QUEUE | IFF_NOFILTER; + EXPECT_GE(ioctl(fd, TUNSETIFF, (void *)&ifr), 0); + + flags = tun_get_iff_flags(fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, IFF_NOFILTER); + + close(fd); +} + +/* A later TUNATTACHFILTER covers every queue of the device, including one that + * was attached with IFF_NOFILTER. + */ +TEST_F(tun, attach_filter_clears_nofilter_queue) +{ + struct ifreq ifr = { 0 }; + short flags = 0; + int fd; + + fd = open("/dev/net/tun", O_RDWR); + ASSERT_GE(fd, 0); + + strcpy(ifr.ifr_name, self->ifname); + ifr.ifr_flags = IFF_TAP | IFF_MULTI_QUEUE | IFF_NOFILTER; + ASSERT_GE(ioctl(fd, TUNSETIFF, (void *)&ifr), 0); + + flags = tun_get_iff_flags(fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, IFF_NOFILTER); + + ASSERT_EQ(filter_attach(self->fd, filter_accept, + ARRAY_SIZE(filter_accept)), 0); + + flags = tun_get_iff_flags(fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + close(fd); +} + +/* After TUNDETACHFILTER a later attach must not install the filter again */ +TEST_F(tun, detach_filter_clears_reattach) +{ + short flags = 0; + + ASSERT_EQ(filter_attach(self->fd, filter_accept, ARRAY_SIZE(filter_accept)), 0); + EXPECT_EQ(ioctl(self->fd, TUNDETACHFILTER, 0), 0); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, IFF_NOFILTER); + + EXPECT_EQ(tun_detach(self->fd, self->ifname), 0); + EXPECT_EQ(tun_attach(self->fd, self->ifname), 0); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, IFF_NOFILTER); +} + +/* TUNDETACHFILTER must clear the filter of a queue that was detached with + * IFF_DETACH_QUEUE as well, not only that of the active queues. + */ +TEST_F(tun, detach_filter_clears_detached_queue) +{ + short flags = 0; + + ASSERT_EQ(filter_attach(self->fd, filter_accept, + ARRAY_SIZE(filter_accept)), 0); + + EXPECT_EQ(tun_detach(self->fd, self->ifname), 0); + EXPECT_EQ(ioctl(self->fd, TUNDETACHFILTER, 0), 0); + EXPECT_EQ(tun_attach(self->fd, self->ifname), 0); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, IFF_NOFILTER); +} + +/* A TUNATTACHFILTER with a bad length must leave the installed program and the + * filter state that TUNGETIFF reports alone. + */ +TEST_F(tun, attach_filter_bad_len_keeps_program) +{ + struct sock_fprog gf = { 0 }; + struct ifreq ifr = { 0 }; + short flags = 0; + int fd; + + ASSERT_EQ(filter_attach(self->fd, filter_accept, ARRAY_SIZE(filter_accept)), 0); + + errno = 0; + EXPECT_EQ(filter_attach(self->fd, filter_accept, 0), -1); + EXPECT_EQ(errno, EINVAL); + + EXPECT_EQ(filter_get(self->fd, &gf), 0); + EXPECT_EQ(gf.len, ARRAY_SIZE(filter_accept)); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + /* A queue attached afterwards still gets the filter, so the rejected + * ioctl left the program on the device alone. + */ + fd = open("/dev/net/tun", O_RDWR); + ASSERT_GE(fd, 0); + + strcpy(ifr.ifr_name, self->ifname); + ifr.ifr_flags = IFF_TAP | IFF_MULTI_QUEUE; + EXPECT_GE(ioctl(fd, TUNSETIFF, (void *)&ifr), 0); + + flags = tun_get_iff_flags(fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + close(fd); +} + +/* A TUNATTACHFILTER with instructions that bpf_check_classic() rejects must + * be refused, and must leave the program that is installed in place. + */ +TEST_F(tun, attach_filter_bad_prog_keeps_program) +{ + struct sock_fprog gf = { 0 }; + struct sock_filter bad[] = { + BPF_STMT(BPF_LD | BPF_W | BPF_LEN, 0), + BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0, 1, 0), + }; + struct ifreq ifr = { 0 }; + short flags = 0; + int fd; + + ASSERT_EQ(filter_attach(self->fd, filter_accept, + ARRAY_SIZE(filter_accept)), 0); + + errno = 0; + EXPECT_EQ(filter_attach(self->fd, bad, ARRAY_SIZE(bad)), -1); + EXPECT_EQ(errno, EINVAL); + + /* the program attached before is untouched */ + EXPECT_EQ(filter_get(self->fd, &gf), 0); + EXPECT_EQ(gf.len, ARRAY_SIZE(filter_accept)); + + /* IFF_NOFILTER comes from the program kept on the device, not from + * the saved header, so a clear flag shows the filter is still there. + */ + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + /* A queue attached afterwards still gets the filter, so the rejected + * program never replaced the one on the device. + */ + fd = open("/dev/net/tun", O_RDWR); + ASSERT_GE(fd, 0); + + strcpy(ifr.ifr_name, self->ifname); + ifr.ifr_flags = IFF_TAP | IFF_MULTI_QUEUE; + EXPECT_GE(ioctl(fd, TUNSETIFF, (void *)&ifr), 0); + + flags = tun_get_iff_flags(fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); + + close(fd); +} + +/* The program is built by TUNATTACHFILTER itself, so a bad one has to be + * refused even when there is no queue attached. A program that is only + * refused when it is built would otherwise be saved and break every later + * attach. Detach all queues, check that a bad length and a bad program are + * still refused, and that a re-attached queue gets the program installed + * before. + */ +TEST_F(tun, attach_filter_bad_keeps_program_without_queues) +{ + struct sock_fprog gf = { 0 }; + struct sock_filter bad[] = { + BPF_STMT(BPF_LD | BPF_W | BPF_LEN, 0), + BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, 0, 1, 0), + }; + short flags = 0; + + ASSERT_EQ(filter_attach(self->fd, filter_accept, + ARRAY_SIZE(filter_accept)), 0); + + EXPECT_EQ(tun_detach(self->fd, self->ifname), 0); + EXPECT_EQ(tun_detach(self->fd2, self->ifname), 0); + + errno = 0; + EXPECT_EQ(filter_attach(self->fd, filter_accept, 0), -1); + EXPECT_EQ(errno, EINVAL); + + errno = 0; + EXPECT_EQ(filter_attach(self->fd, bad, ARRAY_SIZE(bad)), -1); + EXPECT_EQ(errno, EINVAL); + + /* The rejected ioctls did not replace the program on the device */ + EXPECT_EQ(filter_get(self->fd, &gf), 0); + EXPECT_EQ(gf.len, ARRAY_SIZE(filter_accept)); + + /* The queue gets that program again, from the device */ + EXPECT_EQ(tun_attach(self->fd, self->ifname), 0); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); +} + +/* A program configured while no queue is attached must cover the queues that + * are attached afterwards. + */ +TEST_F(tun, attach_filter_without_queues_then_attach) +{ + short flags = 0; + + EXPECT_EQ(tun_detach(self->fd, self->ifname), 0); + EXPECT_EQ(tun_detach(self->fd2, self->ifname), 0); + + ASSERT_EQ(filter_attach(self->fd, filter_accept, + ARRAY_SIZE(filter_accept)), 0); + + EXPECT_EQ(tun_attach(self->fd, self->ifname), 0); + + flags = tun_get_iff_flags(self->fd); + EXPECT_GE(flags, 0); + EXPECT_EQ(flags & IFF_NOFILTER, 0); +} + FIXTURE(tun_vnet_gso) { char ifname[IFNAMSIZ]; -- 2.43.0 No virus found Checked by Hillstone Network AntiVirus