From nobody Mon Jan 5 20:02:52 2026 X-Original-To: dev-commits-src-branches@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 4dlQFm6xgtz6MyXq for ; Mon, 05 Jan 2026 20:02:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlQFm3BXGz3JfY for ; Mon, 05 Jan 2026 20:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643372; 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=Smauy569BZ+JFoUorgov+Sw/6yd994BpGF9sig+IWu8=; b=l4bK1X4JuXgZaNFF7VIX/+dRo8QqO1nbzQIkrq8OE2roW0S0e593mXAYVtBzHB/5cB+F62 WYMMUV2ymRcQVBmdMOen+biPwzUYRaqA5dD6OSkvlE3kXWlT6Qz0sPbJBZVfwkx9TGS33V N7d6vvz/DUo6huVqcQ6gyE8ycNoR41TO0a5Awrl1jZDUe/miK6boao3HKcQUuG2XiX//NQ Zqc9QNt5Y6l3NImR8L3qXDT0h5QrUCpTEP2poiWiKz6p4ap42R6/XI8EEhBn10OL/n4MOP JSTZj1ZbPtRNHsXRj+gz2/tvMTi0V2cO/vmQThwzY0XWf8mtA/j7JaElY7PA4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643372; 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=Smauy569BZ+JFoUorgov+Sw/6yd994BpGF9sig+IWu8=; b=prFLNGgK4jdos+r73UIHQWUTIF501XhtyGRLYCbYVqeQ2slEu1hTrf4NynYl7S54yNmMaE 3v2u5Xj6IIvHhZ2ZOYH3hlpmRH9/xxFLs1rF9t5EoeMvJ/1z+riB/l9vqJNaTvHVOjPqKl lhnl237IH2WjB7m7IjuxklWLX2GWsa9m6tjfkHfXfcTUpvgKzwdBhQt/sJSsrqWhZclfW9 jfaP8vf7RyyJCQS0SqjyEwryl+MKDOX8KTgvwFELEfjjSx33O2fy/5MoTTFixJgBs4BOX9 hawZQxsiVJ9/Xvz6hA/qPEwTm9Ci1qccWp4qzr+hRwWbd9d7jHfuc5mQ+OkFag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643372; a=rsa-sha256; cv=none; b=Fj3S7qjs0sxGrO2e1wkRTrM/nH88567k4mcQnsrtISkrAktClttz16jQu+sUA1W/nqzdJT m1duMJLxhr7fe0GPxZHlJXikmSicBFUH1rH4m6ldHJDGce+IRHchs62J3j1YgiI2uyLSEz H6tr1kiyjOR+xaBYGiUxvdsb1fUI6FJPRt6eAuLek0LF2u2t67lEDUKTazZ1TZ8s+ByN0a rVYZgxD3Nlj0j8u/CjKMM2q94nbnTDAPGTKRSFQ+C+qmeLDlEFwKzVVdZRfVvGZI3O1P9l gPWCbW1Slo+hqM9mGbe7lCijlQQ8s29VZwfVWmIij7L0BiqgYzG3dmlq3SeUcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dlQFm2W88zbj3 for ; Mon, 05 Jan 2026 20:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f2e5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:02:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 01bf278bd92e - stable/13 - ipfilter: Add ipf_check_names_string() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 01bf278bd92e9b809bc15cd5d68201f426d5b208 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:02:52 +0000 Message-Id: <695c18ec.3f2e5.4bb38c4a@gitrepo.freebsd.org> The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=01bf278bd92e9b809bc15cd5d68201f426d5b208 commit 01bf278bd92e9b809bc15cd5d68201f426d5b208 Author: Cy Schubert AuthorDate: 2025-11-18 19:23:06 +0000 Commit: Cy Schubert CommitDate: 2026-01-05 03:40:10 +0000 ipfilter: Add ipf_check_names_string() ipf_check_names_string will verify userland inputs in names strings (fr.fr_names, in.in_names) for correctness. Original concept of ipf_check_names_string() instead of macros by markj. Reviewed by: markj MFC after: 1 week Differential revision: https://reviews.freebsd.org/D53843 (cherry picked from commit 525c535d5aa87f686dcfee620619827f7c6090db) --- sys/netpfil/ipfilter/netinet/fil.c | 31 +++++++++++++++++++++++++++++++ sys/netpfil/ipfilter/netinet/ip_fil.h | 1 + 2 files changed, 32 insertions(+) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index ce96558fe99a..e152fa23c83c 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -9955,3 +9955,34 @@ ipf_inet6_mask_del(int bits, i6addr_t *mask, ipf_v6_masktab_t *mtab) ASSERT(mtab->imt6_max >= 0); } #endif + +/* ------------------------------------------------------------------------ */ +/* Function: ipf_check_names_string */ +/* Returns: int - 0 == success */ +/* - 1 == negative offset */ +/* - 2 == offset exceds namelen */ +/* - 3 == string exceeds the names string */ +/* Parameters: names - pointer to names string */ +/* namelen - total length of names string */ +/* offset - offset into names string */ +/* */ +/* Validate the names string (fr_names for ipfilter, in_names for ipnat). */ +/* ------------------------------------------------------------------------ */ +int +ipf_check_names_string(char *names, int namelen, int offset) +{ + const char *name; + size_t len; + + if (offset == -1) + return (0); + if (offset < 0) + return (1); + if (offset > namelen) + return (2); + name = &names[offset]; + len = strnlen(name, namelen - offset); + if (len == namelen - offset) + return (3); + return (0); +} diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h index 7343fd079564..92935689e0c4 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -1861,5 +1861,6 @@ extern int ipf_ht_node_del(host_track_t *, int, i6addr_t *); extern void ipf_rb_ht_flush(host_track_t *); extern void ipf_rb_ht_freenode(host_node_t *, void *); extern void ipf_rb_ht_init(host_track_t *); +extern int ipf_check_names_string(char *, int, int); #endif /* __IP_FIL_H__ */