From nobody Wed Feb 19 10:41:42 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 4YyXxz3dk8z5p9gj; Wed, 19 Feb 2025 10:41: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YyXxz0NY0z3llY; Wed, 19 Feb 2025 10:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961703; 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=CxxvoYUqvlPf/X8t/Gj+VQfyKo+KPJRKj/JP67ToWL8=; b=KPmtHFpu3hq0rYZfyoxUhziTf0Urmz/BwPWm+2rQc7m21NciDd5esrCt99TbP+OLd2KK5r f8yOZ1jMFFdafSGaMyDKPIUL2dCp/6Kdmy28rd9hEw0iCo2GRt79E92GhucGZvKaU2PSFJ D8e7Uu39k0rmZlVDillxgKIELWqIrddRy16DGhhOQi3q3lgT4Bnr4kFkxlmDCvZkcQh3bb aBH2PiOKbtGmFPGje6cKh2v8MCqj6nczEYQN4d5Xq65VHqw7DOL2LDJ/vj3PZ2ePs/nxMu m9N0GJNWDTv3dS19hiG9bGSZ7fMyGMEzoS4eQbrLCpa5ZfVW9RyNkHghgN0gCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739961703; a=rsa-sha256; cv=none; b=JiorzOT/NQ0QL1fikisPw/BF3OmGvGiK6eeyQxotHhzStPklxUj+RFAMo3xahG+p6+0GWz V5OCDgV9D8t1x3QK6PTU+3sfY5YV2u/hb4r0uEFAh93Q3wXMWyX6IJfVFzJx0tLmONcpRp ZyqNcnvT1evBm1tU6DjKqw7TG/OWB1C9VCIuOJ/RZ4q7P3egn3GX04+0ppxJAMzKDn244v 7XrBrwz7Lnz6S+Wk4YwH5C7UGRuIIZZTOzykNnRawRRBiX/1FoRD2FRn29ddE2daejaUdL PkIvEOTYHVFlvY1JTQnTTEvO/4ZV4GA7PmDdf8McvCBp85h8uHegJTRsoE0FRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961703; 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=CxxvoYUqvlPf/X8t/Gj+VQfyKo+KPJRKj/JP67ToWL8=; b=h/arWXxSuSG91rbwZuDKvM758bdUkBL3VtlUoOcOJrGdVns/AqWpcT4jyArsCEjwaEqICA alkABmykpQQ7bj8djgKgfTUYsyDMujwN+CXLh9wS1mG6s6tQ3izpATnHa7EKjEjDya2Snt SR3LRFQZzlfv8DUbApa0YLa4/P2xc1ZCce2Jo/y0N9g7VAu7ddbjGX9Yy5xcuGEaeJswoT 6aCCy5S4MVBfNT+2G93ryZ9HX4KPMoHrDLqccFEdYMkGLKXwStx/SdEoD0dEbNRrAPXvcU hu5QtvYz28SMFVFf2GhFKWsaV35cYSk5ll7Zsz7UH/y96up0hVy512b/cYn/PA== 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 4YyXxy6vc8z12dJ; Wed, 19 Feb 2025 10:41:42 +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 51JAfgDe035477; Wed, 19 Feb 2025 10:41:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JAfgdf035474; Wed, 19 Feb 2025 10:41:42 GMT (envelope-from git) Date: Wed, 19 Feb 2025 10:41:42 GMT Message-Id: <202502191041.51JAfgdf035474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2514ac810dc9 - main - pfctl: Don't allow embedded nul characters in strings. 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2514ac810dc992c6a9ae6854b9a06bba6eb10782 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2514ac810dc992c6a9ae6854b9a06bba6eb10782 commit 2514ac810dc992c6a9ae6854b9a06bba6eb10782 Author: Kristof Provost AuthorDate: 2025-02-12 16:36:47 +0000 Commit: Kristof Provost CommitDate: 2025-02-19 10:41:10 +0000 pfctl: Don't allow embedded nul characters in strings. Fixes a pfctl crash with an anchor name containing an embedded nul found with the afl fuzzer. pfctl parse.y patch from and ok deraadt@ Obtained from: OpenBSD, jsg , 41eef22fad Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 522d2a910de7..f3334c961909 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -6795,6 +6795,9 @@ top: } else if (c == quotec) { *p = '\0'; break; + } else if (c == '\0') { + yyerror("syntax error"); + return (findeol()); } if (p + 1 >= buf + sizeof(buf) - 1) { yyerror("string too long");