From nobody Thu Sep 4 18:16:26 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 4cHnjl13xnz66Wxp; Thu, 04 Sep 2025 18:16:27 +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 4cHnjl0Lx1z3J75; Thu, 04 Sep 2025 18:16:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009787; 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=6CgBn29GNEgIpFX+JbDWfZZTlpVbWo44JV6Fb6LQ8OE=; b=TWQsZHwEysW8RU/Cm/anlCMH9HZVgSqcPH+nQ8X6YnHAecnJV4OR+Hgmy8UrNLrXPhiXWR llJ2R9q/KuCPVCE3v5KRo3NaIdyW2UY9nw9IoPUSb8HmXMiAE6P6XboguFk40G8wNTS4Pu y/waPnm5ughEVCO2+XdBLV4EEwqJJNnPbPaKa4YZZVmZU2uZuBryudxbTYTpyMgjvXbEAY +QnrnCUUJwlSL17FS1y6V1TVe0sp1XDzyETeCpF11sFAxnkfw7w6+G9ULZoMWjgItrt8WF R8qsuC1p29lyE4XM3VJ3dghQ42I5iWEKwxlRXUn6lTs/kP+DalN2KvL1NmbFmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757009787; 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=6CgBn29GNEgIpFX+JbDWfZZTlpVbWo44JV6Fb6LQ8OE=; b=SuyKY7vNei+t44Nw10i+iL+ZMLQDQeaxhNLJ3leOGY3p7xI5ZvLkjFNGDw/9PpB0ijqrWU x+TRjl3u7tXmF4m478bodmf/vASejlQE8WghNaxpIz4WcGyfQhYRpXUqfK8XxqFbop6/lZ o4lRoSgHyEdFjPzSEPmBsgTUbF60CPxEfNqdzMRWe6yYtp0rbNAoWYyMqCc6W0An7tvfWK iKgdP03wHeaLrBmPv1VzrjGriB59LtioSMkl/sE0jVlKzsJ3M0z1T75l6nJp8g+WyGx5cP j4eqHlsAxKvaRUCenHiKRkLzo8N7r1AokMyecd0/sELs+xVuGSHNMDJH9foi2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757009787; a=rsa-sha256; cv=none; b=JbHK1uhlKjBT8Prv9kwJxhEk4W+GLKtVjX9yakjF3589+ucBiITZFoc9KeJ/xwvrsWsDtc VRfItaMjdiAjQRZglFCKPRzS21fxxoFPhfMSKP+d3ZDiKJoSZcQnXg+x1/wxRxWB3Xs5oo b24lDJhStAOfW3QaH1itPZ34aBxiac47TaNys4IW4Sraj71XHFeDnO+W8HeKz0e/nSZuWC eUkK9octwTPHk7xzFlP1dMiXHwSwuxpCq6VkB6Nu5G32ntF8XCywetkOhbjCnnC1fvMxJd hnbO9Kakd9Zmbcf4Es9M+z+MHdz1nTG37BXDuIK6KJXxVHv0veujprgbF+A8rw== 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 4cHnjk6twSz1C7B; Thu, 04 Sep 2025 18:16:26 +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 584IGQsp039933; Thu, 4 Sep 2025 18:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584IGQpK039930; Thu, 4 Sep 2025 18:16:26 GMT (envelope-from git) Date: Thu, 4 Sep 2025 18:16:26 GMT Message-Id: <202509041816.584IGQpK039930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bb5b0c1624fb - stable/13 - ipfw: Fix segfault in NPTv6 rule parser 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bb5b0c1624fb6a7032367d3d0c460d407756cba3 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bb5b0c1624fb6a7032367d3d0c460d407756cba3 commit bb5b0c1624fb6a7032367d3d0c460d407756cba3 Author: Seyed Pouria Mousavizadeh Tehrani AuthorDate: 2025-08-21 17:40:29 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-09-04 18:15:15 +0000 ipfw: Fix segfault in NPTv6 rule parser If the user specified a prefix length with either the internal or external prefix, we'd jump to check_prefix where we'd dereference p which was most likely uninitialized. Instead, store the various prefix lengths separately and check them all after the loop. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50597 (cherry picked from commit 64bc9ac8cd9a42259aeb1715d4e14902aa83fcac) --- sbin/ipfw/nptv6.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/sbin/ipfw/nptv6.c b/sbin/ipfw/nptv6.c index 45cee5df8125..5f66cce5aacb 100644 --- a/sbin/ipfw/nptv6.c +++ b/sbin/ipfw/nptv6.c @@ -154,10 +154,10 @@ static struct _s_x nptv6newcmds[] = { { NULL, 0 } }; - static void nptv6_parse_prefix(const char *arg, struct in6_addr *prefix, int *len) { + long plen; char *p, *l; p = strdup(arg); @@ -168,13 +168,15 @@ nptv6_parse_prefix(const char *arg, struct in6_addr *prefix, int *len) if (inet_pton(AF_INET6, p, prefix) != 1) errx(EX_USAGE, "Bad prefix: %s", p); if (l != NULL) { - *len = (int)strtol(l, &l, 10); - if (*l != '\0' || *len <= 0 || *len > 64) + plen = strtol(l, &l, 10); + if (*l != '\0' || plen < 8 || plen > 64) errx(EX_USAGE, "Bad prefix length: %s", arg); + *len = plen; } else *len = 0; free(p); } + /* * Creates new nptv6 instance * ipfw nptv6 create int_prefix ext_prefix @@ -190,10 +192,10 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) struct in6_addr mask; ipfw_nptv6_cfg *cfg; ipfw_obj_lheader *olh; - int tcmd, flags, plen; + int tcmd, flags, iplen, eplen, pplen; char *p; - plen = 0; + iplen = eplen = pplen = 0; memset(buf, 0, sizeof(buf)); olh = (ipfw_obj_lheader *)buf; cfg = (ipfw_nptv6_cfg *)(olh + 1); @@ -206,10 +208,8 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) switch (tcmd) { case TOK_INTPREFIX: NEED1("IPv6 prefix required"); - nptv6_parse_prefix(*av, &cfg->internal, &plen); + nptv6_parse_prefix(*av, &cfg->internal, &iplen); flags |= NPTV6_HAS_INTPREFIX; - if (plen > 0) - goto check_prefix; ac--; av++; break; case TOK_EXTPREFIX: @@ -217,10 +217,8 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) errx(EX_USAGE, "Only one ext_prefix or ext_if allowed"); NEED1("IPv6 prefix required"); - nptv6_parse_prefix(*av, &cfg->external, &plen); + nptv6_parse_prefix(*av, &cfg->external, &eplen); flags |= NPTV6_HAS_EXTPREFIX; - if (plen > 0) - goto check_prefix; ac--; av++; break; case TOK_EXTIF: @@ -237,24 +235,29 @@ nptv6_create(const char *name, uint8_t set, int ac, char *av[]) break; case TOK_PREFIXLEN: NEED1("IPv6 prefix length required"); - plen = strtol(*av, &p, 10); -check_prefix: - if (*p != '\0' || plen < 8 || plen > 64) + pplen = strtol(*av, &p, 10); + if (*p != '\0' || pplen < 8 || pplen > 64) errx(EX_USAGE, "wrong prefix length: %s", *av); - /* RFC 6296 Sec. 3.1 */ - if (cfg->plen > 0 && cfg->plen != plen) { - warnx("Prefix length mismatch (%d vs %d). " - "It was extended up to %d", - cfg->plen, plen, MAX(plen, cfg->plen)); - plen = MAX(plen, cfg->plen); - } - cfg->plen = plen; - flags |= NPTV6_HAS_PREFIXLEN; ac--; av++; break; } } + /* RFC 6296 Sec. 3.1 */ + if (pplen != 0) { + if ((eplen != 0 && eplen != pplen) || + (iplen != 0 && iplen != pplen)) + errx(EX_USAGE, "prefix length mismatch"); + cfg->plen = pplen; + flags |= NPTV6_HAS_PREFIXLEN; + } else if (eplen != 0 || iplen != 0) { + if (eplen != 0 && iplen != 0 && eplen != iplen) + errx(EX_USAGE, "prefix length mismatch"); + warnx("use prefixlen instead"); + cfg->plen = eplen ? eplen : iplen; + flags |= NPTV6_HAS_PREFIXLEN; + } + /* Check validness */ if ((flags & NPTV6_HAS_INTPREFIX) != NPTV6_HAS_INTPREFIX) errx(EX_USAGE, "int_prefix required");