From nobody Wed Feb 19 10:41:39 2025 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 4YyXxw1f9Vz5p9jP; Wed, 19 Feb 2025 10:41:40 +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 4YyXxv4lRkz3ll6; Wed, 19 Feb 2025 10:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961699; 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=Bq1+FR4BDFF5dgM3nQsbtvAQL7xMkfGjjx7GkoOQju4=; b=ds3HQFzfK9Z5HgvFv/MgFmwuv1pNkgkInRHMQiWSYRnkQhOHbX/RDCuVPLjDrh+2PqGL/T bzwwna+Am4j6lpN3wpqyAOQPcmIX7qcmkXip0xPOBLS513fIDKd622uptIxJcY8YV0+mXq JTPaMXUZKHUNpEmmRlfIhJDG+njEFRU/SDPlgFmg5BjviYUrjJB6m6uGk0eNutHOmKeWcA AJZPsBUf5oOD6wzNI29i3GekR+/E80KiJXRlRosiU9rtL0HTDQ7IjFRd2wDhaYv3Y5aaSI mCVpUcIPY1FipB89uSe3xXhKAIud5feOjJ2AhWPbVLKG0TiZ2gwcnqVB30REsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739961699; a=rsa-sha256; cv=none; b=qzWD56l45i+XgR5LtxA/1Zuzn8VwUSg9o7MpWTU9vgTW/LM6kQdqjFuqff2+71zW4jSWfM GAogoER062Qfhu3fUaWnhX95YaUzS3Kve2aG4dnWvHB1ZKPKMydTm6gEU3O55STQ0N9IMB rpe8StwIEbdAQ2Z/bF/2fnqth7ydEFq1WAR9wVKNS/0CgRrwpaOm5lWahRESPFO32OG+ke EOHgp6nLBf/b4IykTKgOyCPL0BheNfe9ZxkSITzOpvkwmhkwwvpmsUSJLbTX4MnTOHY9z3 AKozJYX0LBxYnT4Vk60PYFswNbPTZDKwWt0vEu+4ENqlQTSn2tctiiZW/8Dc1w== 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=1739961699; 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=Bq1+FR4BDFF5dgM3nQsbtvAQL7xMkfGjjx7GkoOQju4=; b=Qq5LkXd3n0soZgc8JUwkrvlNrsjyj5SvQWZBBrgNBSUC8jLiO8q0nWbyVDu1ZihaDw0q22 BSCGdXDyJ80WHxUxMwqz59OHSAmUUMwPDdNR6t/46CBJQxUC15xWuXiwEtfUWA/nEcSVbF U+yrT5krxcunBs2Lz2IIs2Sy7S/LlXpuG2M/5VDeuTBxBmHNoI0lyB+XYk6OVTOAM4bUCC VjhZzTqXZ+DGBtqWudVuSbckQ3QSkrxSJLE81Ov4PmNNMue298jUM1rSMAQG6Rm7EeFovD WuiXpYp9mmehykEthkXnIaZpXogj1ewgsbBf75eBq4CsrCMrVZMXGsgPxDpIdQ== 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 4YyXxv4GTkz12md; Wed, 19 Feb 2025 10:41:39 +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 51JAfdtt035369; Wed, 19 Feb 2025 10:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JAfdJK035366; Wed, 19 Feb 2025 10:41:39 GMT (envelope-from git) Date: Wed, 19 Feb 2025 10:41:39 GMT Message-Id: <202502191041.51JAfdJK035366@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: 5b7bfd0046c2 - main - pfctl: consolidate some code by using reallocarray in all cases 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 5b7bfd0046c2a3725fa71783ac7d7b842ec0de58 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7bfd0046c2a3725fa71783ac7d7b842ec0de58 commit 5b7bfd0046c2a3725fa71783ac7d7b842ec0de58 Author: Kristof Provost AuthorDate: 2025-02-11 15:12:55 +0000 Commit: Kristof Provost CommitDate: 2025-02-19 10:41:09 +0000 pfctl: consolidate some code by using reallocarray in all cases ok deraadt millert Obtained from: OpenBSD, tedu , 97d14fe110 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_radix.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 94de63414885..3bb2469a9bfb 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -434,25 +434,15 @@ pfr_buf_grow(struct pfr_buffer *b, int minsize) if (!b->pfrb_msize) { if (minsize < 64) minsize = 64; - b->pfrb_caddr = calloc(bs, minsize); - if (b->pfrb_caddr == NULL) - return (-1); - b->pfrb_msize = minsize; - } else { - if (minsize == 0) - minsize = b->pfrb_msize * 2; - if (minsize < 0 || minsize >= SIZE_T_MAX / bs) { - /* msize overflow */ - errno = ENOMEM; - return (-1); - } - p = realloc(b->pfrb_caddr, minsize * bs); - if (p == NULL) - return (-1); - bzero(p + b->pfrb_msize * bs, (minsize - b->pfrb_msize) * bs); - b->pfrb_caddr = p; - b->pfrb_msize = minsize; } + if (minsize == 0) + minsize = b->pfrb_msize * 2; + p = reallocarray(b->pfrb_caddr, minsize, bs); + if (p == NULL) + return (-1); + bzero(p + b->pfrb_msize * bs, (minsize - b->pfrb_msize) * bs); + b->pfrb_caddr = p; + b->pfrb_msize = minsize; return (0); }