From nobody Wed Aug 2 13:45:23 2023 X-Original-To: dev-commits-src-branches@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 4RGCvM6w4wz4qc7N; Wed, 2 Aug 2023 13:46:47 +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 4RGCsd6MXrz3mcl; Wed, 2 Aug 2023 13:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690983926; 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=WAi7Ko4j40sNAkXDSL5jN6qnG/+tKye75ive2I97YY0=; b=NUWAG4UYjN9DO3CvJ5QfuSgLyRIeLEOv8j3OT+dhr/SDLhRZ6aiXU25u8viEv4puQ20yLV jcSTs3W3xUL6CSHio/dOz05Ctj7mYIzV+WsTAQHppHyQZy+9khjAPtDIBK6OOWUr934b73 XmX/lD0kfUDp00gdeamFTnOorpAG7544b1C8u2Vd2qcl+6nL1SqwrPWrdqvf4kAMXCV+tT ReVPowQe4FrIH4JDQzHA922lWDLH2NmdB7FyZxZl1ZYCJ7Hk7JC13uM2GCIfPwAqkalcNk M8Uzs8loHZWaqIRl8ZVQt6BmJcI1WKr0N5vAwAoPCnCipqOoD2HHmtuZiDyfDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690983925; a=rsa-sha256; cv=none; b=hs0h13UHzWZctrXszeHylGVjJ7GwfOgQBizwRx6uVdP8UvsNQrKh/cBcaCw9ySJXUKGmxF n8HNjYWhEcm6sjXXxN2DWzCAm5hKnwN1zW1eztnlRzoajeSsWcs3uQHZRtrh50plsCQlnu yyaNStf3Y8TrCb6G5Ln3vA3Ld5jvc2ONlWHH3kgtxlJnhF1adZhqsgNzMmeSfftL5+zaNU AnUP9+WHWcomQs9Q2wciPwwpJJVG+vlE3/tKcxcRB3qk4NjQ2Ob/WeNLkgnbAobjMtsKfj nvt8aWi9/4h8lqZAPD28nIjBYSjw7pckp3OathXW0U+F8leH7CdKAVMInTWTOg== 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=1690983925; 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=WAi7Ko4j40sNAkXDSL5jN6qnG/+tKye75ive2I97YY0=; b=e7E6EatHAk1Db/LehUou2xwon9MOOLTmiWPJL4B1PyapaCeyfnxQMi0x/DMeeq0HIDPzmp UhPf9TXy+UfzR4hggMweI26jyg9yxrDKY8+hlq+eZcO54gS0Z/KNh3mQJZtgViLg3QPygO 7PqVNeSA2y+5Tm0fxgau3MH7RpmZTO+ggevw5aHFECsy/x565gEVn3jTC1zhDq9Yx+2I1c cgoa4bnO7dnVfkkDUV5ncvnssXLGoACJc2Ho3z1pRqutXyr8PYqCohsXvTnqiF2EOSE37+ c0hR4GTWVGjb6z762DXEoJnDTOvD6z5eD77jNq8euvK4zNz6o7UADg2BhbvUqg== 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 4RGCsc191GzM1m; Wed, 2 Aug 2023 13:45:24 +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 372DjNju071285; Wed, 2 Aug 2023 13:45:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372DjNQx071284; Wed, 2 Aug 2023 13:45:23 GMT (envelope-from git) Date: Wed, 2 Aug 2023 13:45:23 GMT Message-Id: <202308021345.372DjNQx071284@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: fec383bb5385 - stable/13 - libpfct: ensure the initial allocation is large enough List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: fec383bb53859a9fd0862513fd04dc2a710537b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fec383bb53859a9fd0862513fd04dc2a710537b5 commit fec383bb53859a9fd0862513fd04dc2a710537b5 Author: Kristof Provost AuthorDate: 2023-07-26 08:30:22 +0000 Commit: Kristof Provost CommitDate: 2023-08-02 08:41:55 +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);