From nobody Wed Nov 26 15:18:37 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 4dGjrM25MNz6JBks for ; Wed, 26 Nov 2025 15:18:43 +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 4dGjrM0VPhz3N01 for ; Wed, 26 Nov 2025 15:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764170323; 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=/TS1WK6iNcj7IkdEcCVN8Zv/9zRomS5tOt/Y8ftjArQ=; b=hDQV7htZol0T+mYiiXoPqjNdhNGnCcSrX9Q2Ljl2UiWqRQdbWKKfyKz9llK7ciYbgFRLC5 hhuyf5FVfBUhz9B8uyi0lluHiHympvKBDqXJbMgBLiPiWU0G4BTolj8allwNyh5os08kkL 11SnrXqcPhriu/HJlP7TETo74o25Wq9iTJXLVpKzQ23Oka5h+OlwFdYMK7vXauu0/9/PPY nDLLh8rnEwtmhxGc9noBEF9jyRa6jB/j+lWzdxiOEz/psTNEqXtKeOAtqoOVMjmg0OKskj nE745NV95gopj/eUyZcb+EsWozIlsXcYAy/CIUyX/jPC6w4Y3netOUMbisgnPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764170323; 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=/TS1WK6iNcj7IkdEcCVN8Zv/9zRomS5tOt/Y8ftjArQ=; b=uFyRmM+vrEAvBZ6GQmb9vuA9HQyGtvR0L93VxO2NX42Iej+fy5EjmE6hTffhPtQ91Wpgim wkR6X+PClNDRDYmUwa1Y/dLDDbifzKkPJ5/8Y2TQuYvhRah1pLno1Voih7MLS0dxjhrDkB aNfPN60XxtGpDZnQk+sTJe/bc9nn6kwmDjCfjBNPGPibtjDbn9d7+m2Dq2Wuj+bvqmG4sU d/waJVwResfl/uBsrtJxXMxD7ns7dwID/eCHFOA3eUl7NUREXt+jJSdrgPPIRwY2a7tS4m RKQxmEkhMr9ORzHrupusBtT2zszgYohrcP1ht5oRC9HeF+YJLDLs4eB5ylIMPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764170323; a=rsa-sha256; cv=none; b=BPIA8i8k3ZCBbLGKyGlp8MAmlUoGCsRAk+6J0LNfbiI4Xnow34agZMKI3xx6L+9nGbwua5 ZZ1iKNgSgXopUrwGKH26LiT1WPzKB7jDqg10lgzNjqWm5TV+dylujinIecRZyDfNMRjwIV C81xqlI+G8AZqZSdQ54H1X7UyiZeQhP2cTjL8X++69og036YTrNQCPGq6klk8ObLZOUBRz a7fFN0B9YbQbdropExhPEaJE7t+7HsUrGXFXtHvbx0S0ajMh7sRQdB53udGHCSgiFw484D vaRI5xubH1vkuGO5K+6L3GV4/JTa06vsTB/ixcZqQ4T7cy3dKBhUG6KcWokNug== 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 4dGjrM053CzsPn for ; Wed, 26 Nov 2025 15:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30083 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 15:18:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 525c535d5aa8 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 525c535d5aa87f686dcfee620619827f7c6090db Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 15:18:37 +0000 Message-Id: <69271a4d.30083.4fe9a386@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=525c535d5aa87f686dcfee620619827f7c6090db commit 525c535d5aa87f686dcfee620619827f7c6090db Author: Cy Schubert AuthorDate: 2025-11-18 19:23:06 +0000 Commit: Cy Schubert CommitDate: 2025-11-26 15:15:44 +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 --- 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__ */