From nobody Mon Jan 5 20:01:21 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 4dlQD23K6nz6MyPP for ; Mon, 05 Jan 2026 20:01:22 +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 4dlQD175GGz3FK2 for ; Mon, 05 Jan 2026 20:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643282; 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=hpyngycobkXk+GchDLT4sGJEPV56WYAjEAI+Mc7gxFk=; b=PXuf2O5VlQUNwXo/8sNHc08sgpkd1ozPBzNp08ovkSYRQDc7TlQWxK4wUQJqMBt1yxylz1 ovRf0qhXfYogLpdiYLpm45f1tlrc3sXjBnK+Boh5EGQKjholiVbzqj58VZM3GIT2TY6Waw 6WFZas4KHvj43ITBLl8m0ZWXtTAEyXw5p7Oi2xRww03jQ0uxWIflPgry8YdAEcLTIXQjvX ENxCAJL1+Hn5xp4PjhQMo5/2shYRd/naYnRbtOiN1hF/LPV3bqtRKJd2+OEApBlBBC0neA 3uFAZ8mWBg+PZRxbZb6oxwaMObaDVsDurw4Lw0EM7Gao3JNqVhwmwaEqxRvt0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643282; 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=hpyngycobkXk+GchDLT4sGJEPV56WYAjEAI+Mc7gxFk=; b=Jzs9gH80Seq8QV99muyaL1rBrC5zNaf1xdCTSgvRTlqv+qDnjFtOfk7x/dbOOXJmXZu3nk PZKaneMwjQ9Rol2qacMPvpgcRWX74JtrFMwnL++/x6qzka/xehHaoS8fFkrvTG6zxAk4JU OPmzqjzsCU8Ey/YUiUG2NZi4ltYL6coLj2YUKcyt0whYtB58wds8lkQB5vLPcDCGfCG7jK 5gp/Xsz1To6oi9AoN/X9zoRhUpMqsiLyAbUpmySxP7LMkAFJ0oh0O3LTb/p67L5HYFzSAN zfvAMAN29F6Qo2pmu6wtqEulQkni0RXAsYGQBSw7WJkg8U2GvoOJfcoGBdKLSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643282; a=rsa-sha256; cv=none; b=Ysz0Nqy4n1SxSJN3M/jKZES/a7H0nHRxh5j5NK4f8i5Ib6TunqoqBFQrPKz0Yixy5iaT/q KOwbVm9dqO4QgS+jX5ycJanOTAMSIR1f0e1++8P2gSiRI3MDcuCe8FJLvUinUCmKd7Q11g 8+dlo/Hko12KEtPY8FlebI3C9z8AJ4qy8j68pPGZrj3g2c2YQO49HDdTuORRgF38oBP8CC /I6VskVxoF8+nCcA3CQFyaZTC4gLV0EWz4fC9jT+9cGU0wH/dmnk7odl7CDaaNa7y7lfwJ OUYFgZY/BW0dFQuKbcmRdogo5xhlj+atrf1R08wsiD4de5DCkQLQg/u2FZCNwg== 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 4dlQD16fJfzbgf for ; Mon, 05 Jan 2026 20:01:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fda4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:01:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 9ac25e9b5b31 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 9ac25e9b5b31fb03f090e157166b05d2d501a8f0 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:01:21 +0000 Message-Id: <695c1891.3fda4.2c4df9f5@gitrepo.freebsd.org> The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9ac25e9b5b31fb03f090e157166b05d2d501a8f0 commit 9ac25e9b5b31fb03f090e157166b05d2d501a8f0 Author: Cy Schubert AuthorDate: 2025-11-18 19:23:06 +0000 Commit: Cy Schubert CommitDate: 2026-01-05 20:00:53 +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__ */