From nobody Fri Jul 4 09:22:36 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 4bYSpP2GqSz61Gb0; Fri, 04 Jul 2025 09:22:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bYSpP03RHz3plB; Fri, 04 Jul 2025 09:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620957; 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=VjYjJZkArLXNY67CpVq1F9MBoE1FFVmMAeXYuEF7lKg=; b=l9w5PeRrRn2lup2fl6JJRXo/AMPThLkRUZt9DAqinVyzVxUdllrAaSeoemzjJqN8iNpAKr kH/OQMYTySFUOLJQ1vqkn84cFdNsrKRLMYwno6m2UFBKxH1OeXzZFpsjAex0Xd7dnbRos4 3m4scgOq28p+ADvt9mGZKYHdwiLw9A65SAVHa15cN24AZYciC5Nzg07mCnbGzcoZq2VzqF 2M8wTI0T56BBrUS/pB3RMC2UJT0FQqDxGJ8Ts9g34COEzyL8jzVtuXW1jGPKur/GJhosSm ofKwGaQG2+jm98d57bgLp8TWfhj6pLDqRe47bJtXA8yddBvdd0bjW2ZqbnRzWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751620957; 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=VjYjJZkArLXNY67CpVq1F9MBoE1FFVmMAeXYuEF7lKg=; b=dZ80ChsoGp3BpRr2x3n1yr3om8TPI8P1XgNqIBWrDHrHMVohZVDYY8648SMJOewWQUdWNL vjZwSeWoJiCyabhv7L1awAGT3SUpURIn57ytBJluOGdWQAvSE1AKMzj0lxL/QjLM2ggwQQ jUoeb7QdipVq9DAAhtwy3IfEUzkWciIx5TyoyP88zhwRJPfGOD5+7PIiL7tMTVABgm5fkh O2Udd6XaHhp7PCIenuEQYQJh/Xlq91Mug+QlxQwHp42SyXJx6vcP0wmzp+eYWFkt7rWoCt CA7er9x9mYjkOGHrBqF/CHX556ccKiAUPd8/1Cy237VujI+aD+Qi3mIr6kEpgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751620957; a=rsa-sha256; cv=none; b=IuZH/Q1u/p1YY/KYc8gDD1Thoxj7MHgjQPA1TswRdbBQGq9kefzKNbmTAaKq+Emx+axBdy Ps6aanuF/M7WZKg00GqjFg0RAaCKnmWFjSBgdQSRvaGK7+bOqDoutO2A5IiU/bzJGafDp2 4QYLdRd9on9+e/Xgup/8hDwpVVKdrXcfzjStxfBzBxQ4iJ1eahdA1Ljjsoc1ZSqHq+xCuP LsFVkmH5nhKld7YDybLDdu0GIBTTylUucBSXgmB706g2DNbichah05NAuiMzed1ZqyclJq lF1eZEY+FWaDOqKqogQcGFlH3/30nEYZXhLbqc2+nabQmeyk0uACnJRKnUFkOQ== 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 4bYSpN6YtdzlGQ; Fri, 04 Jul 2025 09:22:36 +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 5649MaYK055714; Fri, 4 Jul 2025 09:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5649MaT4055711; Fri, 4 Jul 2025 09:22:36 GMT (envelope-from git) Date: Fri, 4 Jul 2025 09:22:36 GMT Message-Id: <202507040922.5649MaT4055711@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: f78c18a7ac9e - main - pfctl: sync cmdline_symset() changes with src/usr.sbin 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: f78c18a7ac9ebb5079ad4afebd248881e3672ed2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f78c18a7ac9ebb5079ad4afebd248881e3672ed2 commit f78c18a7ac9ebb5079ad4afebd248881e3672ed2 Author: Kristof Provost AuthorDate: 2025-06-30 16:29:01 +0000 Commit: Kristof Provost CommitDate: 2025-07-04 08:31:11 +0000 pfctl: sync cmdline_symset() changes with src/usr.sbin OK sashan@ claudio@ Obtained from: OpenBSD, miko , 22023c0153 Obtained from: OpenBSD, kn , d0f238ef32 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/parse.y | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index beff11bebf69..c59204d3d5a4 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -7150,11 +7150,10 @@ pfctl_cmdline_symset(char *s) if ((val = strrchr(s, '=')) == NULL) return (-1); - if ((sym = malloc(strlen(s) - strlen(val) + 1)) == NULL) + sym = strndup(s, val - s); + if (sym == NULL) err(1, "%s: malloc", __func__); - strlcpy(sym, s, strlen(s) - strlen(val) + 1); - ret = symset(sym, val + 1, 1); free(sym);