From nobody Wed Aug 2 13:45:17 2023 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 4RGCvM6hRYz4qc7M; Wed, 2 Aug 2023 13:46:35 +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 4RGCsW1bmcz3mwk; Wed, 2 Aug 2023 13:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690983919; 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=iG7lTRyT1/j+sTZD1DAYapcPUk6tJjWPW0ZdeS9DTeI=; b=glLROU3VvsHDYckAd/ZdOJxfPZBwGRPvkopJzl4uH3tP/I5OA3FJrCFN+A+k80wHIcOngx ICWs0PBXsnNg8sr0EF3x+3iLSRoJrM8Wz5OIQAnPQGKKHasVlq9fD6NFKR9AvpDxyUfpH9 ZNLXXUaEI+9EGOqSWMVHwJllyBJL7lXWu5/eV7Hs+38YL8BnGmsqVQq6rUgweyonXCyXmH WnoZ5qe1IPDgLGSM4kGRHuv8Yv5E9wW9ND35rfnXwx6d2NMjskZFK8MsHXpj5bYwFy5kyx fsdazE441F9eNeE2MrWOx6CekgkaSTj7Gs9XQKILmzXviAUAxJBGpu/whlPI3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690983919; a=rsa-sha256; cv=none; b=Jdv2XT314k+IDabB8MtKV0JBtvUPMl9vRXUem/y1d1LYaY1e66tvWwf1+C/UZ8U47MjNgU g9Xq0Ux4xY6pyzFvZU+WnNVSsBC3SIZ8PzKWoI2EZxh0lS08gp0QuaRlWLUD+AhWeIRQNo oSkeBDeH1FqpemjJrqDEs5B2vxIWsuVJUPH03Z35S6wo9AvRIo1wftunYmphekjrLWlKCV YDNiUI9ypr4o2fFTDvP5auyPyG9NbMqX/edHCsU4pqHm7STNH1kkVpSG8aSYcJX9b4vKc5 2Io+HkTh31PGAuTWSK36UC2gF8/AZdYUFP58Uwd1BlvanowWfqvFHs7V9wCmRg== 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=1690983919; 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=iG7lTRyT1/j+sTZD1DAYapcPUk6tJjWPW0ZdeS9DTeI=; b=WoX3bcUIoDL92RoUqNr9YKMmD0Gk8OFctGSP8CijTxEQcMv6gvRhiUpLDN9GkUslJzXo5h 9R9uP/56G4lcS9KTTZDgOLInatjJp0pPE0gzQK2E3DC55cIaXandjidra/Mlps0MaqkvSG oUI02TxkeBAQSauqeqkaXRemRRKeMTiL+aSC1ptUuPT6DyZX/YlTS5Krat9hG1YQMhW7aF nSXTegYgRXslY3Y5ITpY2SiaTh2IfyoNJyLoPFQErMHUHWpLUANymCrQSXnHM7E3YguvCr BRCx1noF8uyATw+ENKXKyGLJnIHAxCrk6VVmO8w6MruCAHtmvU3rULRsXIUUMw== 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 4RGCsV3Wn9zLxB; Wed, 2 Aug 2023 13:45:18 +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 372DjHo6071091; Wed, 2 Aug 2023 13:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DjHEr071086; Wed, 2 Aug 2023 13:45:17 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:45:17 GMT Message-Id: <202308021345.372DjHEr071086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 734518564f9d - stable/12 - libpfct: ensure the initial allocation is large enough 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 734518564f9dcfa180dc24d337958a6f8ea94198 Auto-Submitted: auto-generated The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=734518564f9dcfa180dc24d337958a6f8ea94198 commit 734518564f9dcfa180dc24d337958a6f8ea94198 Author: Kristof Provost AuthorDate: 2023-07-26 08:30:22 +0000 Commit: Kristof Provost CommitDate: 2023-08-02 08:41:51 +0000 libpfct: ensure the initial allocation is large enough Ensure that we allocate enough memory for the packed nvlist, no matter what size hint was provided. MFC after: 1 week Reported by: R. Christian McDonald Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 6422599e74db4bb8b47cead46760d96601d8396a) --- lib/libpfctl/libpfctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 99ca563548c9..a095cdd1e54b 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -68,6 +68,8 @@ pfctl_do_ioctl(int dev, uint cmd, size_t size, nvlist_t **nvl) int ret; data = nvlist_pack(*nvl, &nvlen); + if (nvlen > size) + size = nvlen; retry: nv.data = malloc(size);