From nobody Mon Nov 03 08:39:00 2025 X-Original-To: dev-commits-src-all@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 4d0Q3m4Vysz6F9jF; Mon, 03 Nov 2025 08:39:00 +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 4d0Q3m2m82z3klp; Mon, 03 Nov 2025 08:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159140; 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=0ACFBasQk3TeolNQWjXEjGCEuRTQ88+AmPfoY9BNLa8=; b=X952IttmPzaOMXdPMBoW/DCXzDimJxcblKNonUjlKLinedB56XqfRL6znoj/Ig2tNwhSm2 iwcEel7n3Sah1BP9gvhovYKSA5/GIVe2y0BxSYq8SVgPzlGCx9wisolw+kC2byH6g7iTBS WXLBJmU0M4LJL7jMELyDQkZPrXMCxWBmiTfOcGVA521JlCh+bCZ5G2QSPm58AhwPiAl13K qwyKDHRf//W+sM/dfnfN9CoNwJaJOmqaPGPnuQoIu6CYXSdxTmrB93J7Tu7EjgfnmM8lGn m1FxhvHHqlk4AihiSQTHTGbeK/opVU798o5Fi8Sr60jqlld4ThVjrreOVmNpZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762159140; 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=0ACFBasQk3TeolNQWjXEjGCEuRTQ88+AmPfoY9BNLa8=; b=e77bFsetGWmFA1wOGRf2FHGw4PHSdbaELGH+RZZaA84uu0JXx+hN0VjVv2Y1cPOCfl7ebs Z6CAdGiPYHM8mHYFKvC7ozGoxJ+gqXEqZDIpT+UzrKzaBvbBlZJErvj26TTX6xCVkvCOOa PF/1jU8PygskVKpiXDzkCNF8HKL33UylLIg/YO8ZPldO394CaXSSQkY/L3L3yjw0bSHgiK JQKCAbvwRAVNwwjrmJENvjuRywFseG+Rbdp/3sLC95UwbOSXbzbfXkt8okvqoetZYgWO8v ojV+TAb5q69jlZDpmsICS0X1F34LTSIZNVu3cMxccIeV4Wr/tsFtxj0EEAfxNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762159140; a=rsa-sha256; cv=none; b=Ak+MxG58CqohnjKcBeY7PIiXgfMuYkknbA+MzDRoILqsUMnXA26cHlk91eZIXvELx1vkTm TDjNuTEatVBy+d367Oalwn6sPVDIXL6B7UvcCk4jV9DJTu8/xJ8ddOpRiyY6SMBxeeOl+x P0rj8geLPyEF3eDGX9M08qlQH16nqoEVUXe0fksXE8kHXeIemL5eJp17ghMk51T2ep2ouZ FLhueABV9bQ4AL72USg/Q2uLMAwQALqd9+QfezolEeLSwqjEypYyF6DMYIOaPRPmiJudLQ 0bOl7o6dvcjt9dRAWt3GpQTHoNnKAjKpFbUXQvOQrW8XXevTdmu0qpwz41sPvg== 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 4d0Q3m2JsXz13XW; Mon, 03 Nov 2025 08:39:00 +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 5A38d0Qw016411; Mon, 3 Nov 2025 08:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A38d0So016408; Mon, 3 Nov 2025 08:39:00 GMT (envelope-from git) Date: Mon, 3 Nov 2025 08:39:00 GMT Message-Id: <202511030839.5A38d0So016408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 909528f8a130 - stable/15 - pf: improve DIOCRCLRTABLES validation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 909528f8a13004e15c08c4793a6a349716f90447 Auto-Submitted: auto-generated The branch stable/15 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=909528f8a13004e15c08c4793a6a349716f90447 commit 909528f8a13004e15c08c4793a6a349716f90447 Author: Kristof Provost AuthorDate: 2025-10-29 08:28:59 +0000 Commit: Kristof Provost CommitDate: 2025-11-03 08:28:53 +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") (cherry picked from commit 1da3c0ca5b1decaa9cf55859cd134bdcd1218116) --- 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 d7bb62977afb..856bbd6cb9cb 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -4788,6 +4788,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 ff3f1bbcdadc..7a1d2b3800cd 100644 --- a/tests/sys/netpfil/pf/ioctl/validation.c +++ b/tests/sys/netpfil/pf/ioctl/validation.c @@ -193,6 +193,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) { @@ -957,6 +989,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);