From nobody Fri Mar 22 08:37:27 2024 X-Original-To: dev-commits-src-main@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 4V1G0l4NxBz5G5dR; Fri, 22 Mar 2024 08:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1G0l2GLDz4R06; Fri, 22 Mar 2024 08:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711096647; 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=zQyjc2l78a3XF0cOWnWKqYyeWLcZUIGyjC82EaNhOrw=; b=x6uP+40VRukR9Y7W/SGR9Ue8swqUyrvBAcSdc4KHR06Rjz5ov8K3z5ghqphEtnaoFSpk3e I3Od2T8rmhYwKZNr1rayk01vQP7Wptwd4YluxHkx6qKyX1mBada1havgucJi778ncyT5D0 envoR+A+2nqzoPaF5ZCCKpKKE1EFn9e6kndlNuhVAmah7W4LriggvC82IiyZQLKjl59DMo QkSoj+e1VpXR8dBpywFi3mngO/GDGR1BQ8Mtj1ByexQKV1C9n61wDtOmp09rMsAtF7Dpim zbAxOGKkcqT3ztYJM1hKpMEIIp7AFiXSI4XnRalofKO8UqFQYBfNHrkjZXFL2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711096647; a=rsa-sha256; cv=none; b=QSOpWVVxzoaNpZMORUglGf7e7HoBGjEypGOjyXdXmRLTtfucKChCfKxftc407ULnlTLVrw ++FVXNFHbyH+5Sj6/Z4Y5ZLG58L2GDTR1cZwIog/1K9NzuHRfDqM2g2WUdTWLNwrmd7Iqn pI4IvQXzKuW/yBNU3RAZCKSFMSCC2k1X1iRq8LFukJZ00qPMV8ooZNNcDF8eeBXOe6YWGQ n3ACkYGEslYjFHWebbaYIP79ZIrH/veONvGWeibXUEVhinhwks5XTFWyYA2ik9TmLDAxFj J1XfzAZVG4KVAQNhJLPw1NtiAyyiUDLN7AeXrIuxs17f14HxY0DpLdIA+sJlfw== 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=1711096647; 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=zQyjc2l78a3XF0cOWnWKqYyeWLcZUIGyjC82EaNhOrw=; b=r7lUZdSifg/dNF23kDOnDNbTe92SKqf2kzePE0Kw3syS+NqZ5O4a2bwGzBKwD1teZ3Fq3h gezMTRN28viOt9IMZsqsokkxXQzYhMxr3ayKUay6cqeuausVq+d6D9yQ4lKp48SVPEUXuz tX4COiMH1lM+DfHJhP8ZHIS8ZN1GrCSgTeA+iJOFKnr0WYgkcclK3g5IP4kblsXsAE9sgJ 97rH3Kw/J8sZcapy/NXaVNHOCejGrvIbr21v0V4hYB3ObGiPHBe4P4gGs3bVFbrlqAj5cu o1Lx9d3sBYBG9BQja3nsw4LnRv9OLfn0A/ZBUINWPmUZuDitClQqpme2W3h7xA== 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 4V1G0l1swSz1Bww; Fri, 22 Mar 2024 08:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42M8bRlI094250; Fri, 22 Mar 2024 08:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M8bRMI094247; Fri, 22 Mar 2024 08:37:27 GMT (envelope-from git) Date: Fri, 22 Mar 2024 08:37:27 GMT Message-Id: <202403220837.42M8bRMI094247@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: 88f557a2a9c3 - main - libpfctl: fix incorrect labels copy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 88f557a2a9c31aaa954841b06d38eec84a1702fc Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=88f557a2a9c31aaa954841b06d38eec84a1702fc commit 88f557a2a9c31aaa954841b06d38eec84a1702fc Author: Kristof Provost AuthorDate: 2024-03-22 03:21:50 +0000 Commit: Kristof Provost CommitDate: 2024-03-22 08:00:05 +0000 libpfctl: fix incorrect labels copy We copied the entire parsed_labels struct, including the counter to a field that was only big enough for the labels (so not the counter). PR: 277875 MFC after: 1 week --- lib/libpfctl/libpfctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e732c8eef854..076cfd3400e6 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -1297,7 +1297,7 @@ snl_attr_get_nested_pf_rule_labels(struct snl_state *ss, struct nlattr *nla, if (! error) return (error); - memcpy(target, parsed_labels.labels, sizeof(parsed_labels)); + memcpy(target, parsed_labels.labels, sizeof(parsed_labels.labels)); return (true); }