From nobody Thu Oct 30 10:08:13 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cy0DY4j8Vz6FR4C; Thu, 30 Oct 2025 10:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy0DY47P2z3w7Y; Thu, 30 Oct 2025 10:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761818893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQ59jrIrpoBZCny1XoFzk29uUb3iMSigx3a9Q6cGHRE=; b=b/7rqU5lFHvUxvJqj8taoFqrkKD1k5Qg5Cq2dMKZXp/vRIOj5odL/rDagELYrOwmn2ZV+Q khaS+Z2Y/vWZOfmQQkg5u1f9Z5hM91frxcV7AWBtbkhdBptyH9V3UrfVbbbJf3TunMPYAL miZc37d5Cx6nrD0x5gKpKy564oRyhFtEIdPQjVoKpOuzrDBFWkblBckMO/84qayDEPnTiT lKzgCs4ABPG1YyjIe3sJJn+VL6tr+5Kmu+JqRGnsKwVBNmGKB9w/SqhR6sTtQykx1gxOAO hqfkS/sr95/Y5FHY9km803o4cDMk/OFbhLvDbvkFGsgayXOrbePbjq1jrjz00Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761818893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQ59jrIrpoBZCny1XoFzk29uUb3iMSigx3a9Q6cGHRE=; b=GjF05k4cxxzLVnYLmg5jI6mwQk+2eRIoEGG3Za2505asAT+Jg6DZXDvzjn9maCA0DOmulg QZgd7pZ47DFwY1U7YiZrAYsQCqz/tPGfyEAxwvrZtoagP9/GPKGxt7biku/nO45DP8WMtO 8M/yPoQe7cWqv1s5EcgkxdtvTHZ4nLCdIMmxaqYFC4QnB17TtWOLCLqC0uHZC9flAc8G78 C3BAImvkcpfxuteOtb+oOYE9RRxCAjTTABBuffARJiXrfl00ZV/xggmHWUGRAbw254pbzZ wj6fP9j8g1FQLHNmjVdZOIiGc5Bm3fqTgneq0i2i7EsUAZX1VxJQpsGermuhww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761818893; a=rsa-sha256; cv=none; b=c/s6fKZ6OusZo0MhFbEnHOAjlyxu3qvPB4OuWJkQTarE4jlgH/TrLypZcJE/TYltAcNFRi ifMC/71EHsJWdYvaYabOzzMIvw8Oa86TFp4xUVMZWiDCJTIrY43exu33bu+W18qrRqxvaQ sWtTo6pGxyivaDxo7ugqo/PtTZiSkP+/AH5QHms1HP1sdK2dh9/OOF7zvYgR2hYRmH6cWy cRfvUh8YP9pt1zFpecIkb5b9sbMTyjkMhssVcrFbpB5Ktn+jFKHijryvzlvm5WQykx98kk bd+P4VEXk8bAPY0M4A5zuTcEiHfdZpLuB7IOg2dD06I47D6wllc8bFzDN3bcCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy0DY3k4xz2Ns; Thu, 30 Oct 2025 10:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59UA8DVp025981; Thu, 30 Oct 2025 10:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UA8DAF025978; Thu, 30 Oct 2025 10:08:13 GMT (envelope-from git) Date: Thu, 30 Oct 2025 10:08:13 GMT Message-Id: <202510301008.59UA8DAF025978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1da3c0ca5b1d - main - pf: improve DIOCRCLRTABLES validation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1da3c0ca5b1decaa9cf55859cd134bdcd1218116 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1da3c0ca5b1decaa9cf55859cd134bdcd1218116 commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116 Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Kristof Provost CommitDate: 2025-10-30 08:42:27 +0000 pf: improve DIOCRCLRTABLES validation Unterminated strings in the anchor or name could cause crashes. Validate them, and add a test case. Reported by: Ilja Van Sprundel MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_ioctl.c | 11 +++++++++++ tests/sys/netpfil/pf/ioctl/validation.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index a4557f139ae5..703ecf446fad 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4792,6 +4792,17 @@ DIOCCHANGEADDR_error: error = ENODEV; goto fail; } + if (strnlen(io->pfrio_table.pfrt_anchor, MAXPATHLEN) + == MAXPATHLEN) { + error = EINVAL; + goto fail; + } + if (strnlen(io->pfrio_table.pfrt_name, PF_TABLE_NAME_SIZE) + == PF_TABLE_NAME_SIZE) { + error = EINVAL; + goto fail; + } + PF_RULES_WLOCK(); error = pfr_clr_tables(&io->pfrio_table, &io->pfrio_ndel, io->pfrio_flags | PFR_FLAG_USERIOCTL); diff --git a/tests/sys/netpfil/pf/ioctl/validation.c b/tests/sys/netpfil/pf/ioctl/validation.c index 3e03163cc752..a619cfdff2ea 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -194,6 +194,38 @@ ATF_TC_CLEANUP(gettables, tc) COMMON_CLEANUP(); } +ATF_TC_WITH_CLEANUP(clrtables); +ATF_TC_HEAD(clrtables, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); + atf_tc_set_md_var(tc, "require.kmods", "pf"); +} + +ATF_TC_BODY(clrtables, tc) +{ + struct pfioc_table io; + struct pfr_table tbl; + int flags; + + COMMON_HEAD(); + + flags = 0; + + memset(&io, '/', sizeof(io)); + io.pfrio_flags = flags; + io.pfrio_buffer = &tbl; + io.pfrio_esize = 0; + io.pfrio_size = 1; + + if (ioctl(dev, DIOCRCLRTABLES, &io) == 0) + atf_tc_fail("Request with unterminated anchor name succeeded"); +} + +ATF_TC_CLEANUP(clrtables, tc) +{ + COMMON_CLEANUP(); +} + ATF_TC_WITH_CLEANUP(gettstats); ATF_TC_HEAD(gettstats, tc) { @@ -954,6 +986,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, addtables); ATF_TP_ADD_TC(tp, deltables); ATF_TP_ADD_TC(tp, gettables); + ATF_TP_ADD_TC(tp, clrtables); ATF_TP_ADD_TC(tp, getastats); ATF_TP_ADD_TC(tp, gettstats); ATF_TP_ADD_TC(tp, clrtstats);