From nobody Mon Jan 5 20:00:29 2026 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 4dlQC20N1fz6MyQw for ; Mon, 05 Jan 2026 20:00:30 +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 4dlQC15Q95z3CTP for ; Mon, 05 Jan 2026 20:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643229; 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=NfD9moH3pqdF/RjRrKhFM/zllyJ0g9F9DefSgmzVDjU=; b=hQtaVAw7pYVGQSwZKYLob22yWYX0Bpc/o3Syu8MqPG6e6q//nbTxZiAuAXXxvFkmZ6i8Jg rx4bg2R2vK+8wyRPBhxVp3Eg/Pzlbt2QaWRUIiHvTiQtkh/7FHd+7bwSVk4DrlYa/pQ3gA 6VLYeWjTBtpV+GYCN6Qtbd/qbR7ZtqNlvUrlsM3AzkaVCk5CMDDdgce83hj0xFYSepRhwS X0AawLrrdnstcUVpF5lNvbQkRk2yhKkz+Ooh5Ns941JOvKoN5l00VwCpfT6kO9+6GtTEsl 9TxcigGgWEBQY4kmJuR9/4Y9I+PTvw/3J5Y+FVYPS1qL0KX15gFszG7SK+vMSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643229; 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=NfD9moH3pqdF/RjRrKhFM/zllyJ0g9F9DefSgmzVDjU=; b=ODm1hDxYxDNxVovMq5Jc4kVVEJV+u9OsZw1QVyWtPWeKF29vKsuDOKBnzgSeVNW7x3gjmc VmmSxHJ7oV2kf/pDpBBN1kC3s1R+pu/ESQg1YYvCcIE/N2mMssxZqkxxAWbWnIYIpuRE9V YPBYB+QKrwdQ4MnmGrb9405HErFHiAb1fcAJ3RNQszGfp13xmBnmG2AWcXcbDsXbeCUt2o bZWYdjFVawHfpla9jNekfbToWaKI8vUXY0jDe3jZ2TDi8opUP+VtHc2Brehb7g18n8/1za clKYiAC4N+pmpqEaObKRFsus8HWQm5ojQL/eYcCffKPW6hW+t0uRKyH0HAyl3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643229; a=rsa-sha256; cv=none; b=FcpMMgCtjIOaWFEAXaB/9f+G1z46Bu208aPfc3cxhiCXy09fE+EXvxW/7Oy+AZAtqHUUHt ccCFIvYfYZpz/OhOSFkDfCRYp0nO9ozxkJymGdBE40neTdqGgO2Zsy6+N8wVsEZHrdi/Xu g0OPSsV/ui96rRO6fbJb8Xiv57HPlV64WduGkRR1hUNxWdWu9crh8Orf+yJcO0gKAAR/QO A4nUyAp4E6l2UK/ypFOIpee9tPuN4RJufGac9H9PJwZT0qj+ht2yy/IsDTOhkG7YflrCd/ WfPThAq14u68ObdYofZkRP1J0fxows7EmQg3JQvO/kFM84c0GSguSX0yllghCQ== 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 4dlQC14lLbzbZq for ; Mon, 05 Jan 2026 20:00:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 810f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:00:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: da3bf842791e - stable/15 - ipfilter: Add ipf_check_names_string() 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: da3bf842791ebac75f2c336c58ca8d1dce14eb09 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:00:29 +0000 Message-Id: <695c185d.810f.2bfb73ed@gitrepo.freebsd.org> The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=da3bf842791ebac75f2c336c58ca8d1dce14eb09 commit da3bf842791ebac75f2c336c58ca8d1dce14eb09 Author: Cy Schubert AuthorDate: 2025-11-18 19:23:06 +0000 Commit: Cy Schubert CommitDate: 2026-01-05 20:00:00 +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 2fcea433295f..d487cdde20d8 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -9951,3 +9951,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 aa3d1de422db..ad6128d9a8e2 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil.h +++ b/sys/netpfil/ipfilter/netinet/ip_fil.h @@ -1859,5 +1859,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__ */