From nobody Thu Nov 06 07:13:03 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 4d2D1D1yzJz65B88; Thu, 06 Nov 2025 07:13:04 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d2D1D0hgCz3J7X; Thu, 06 Nov 2025 07:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762413184; 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=ulAAuLHt/KJyvU04eCkxEFP115iWasbJm373l6s42Xg=; b=g+aQw+5EVE0P1zvf+ZM9g4MMXWoECYpXJ1QlXxjvTJC0STu73B7lxOBGRzfLDK1tXWNvoX JJZRh1KMuthEGm1iYgQXj4WonUhJ0VblOzKCKxWsDwyyNURHnp0onfxe8xWtuc+nKjPfQr eVs2u0YuDZTu7dnaQkNELj4O3HNzmuM7cHyHbbEHoImsEHGTS1jXpOZujtxBRA5bYlyz2u j/HiA8TxRELVUvSqaXvngNK7sxP4A3FCBLYBII3YaB2oj6xGEhPODs37FDCvSepeqRXEtm Y00N9e8znbNcDpBj0QMYAdHxnb9IfG61hCFqwx6OU0PDrwTMGohSEh7GnVUiwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762413184; 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=ulAAuLHt/KJyvU04eCkxEFP115iWasbJm373l6s42Xg=; b=PV07BnqKSNsaKzH4FR+qV7qA3YHhsrElXuHGiWigWUV+R4OvpNVIQdHopCvCxo2a+wrTpp 1UE+X831jQ1EB3HpjZFwC1tiq1w11xONBPjRZVk5T0o5XJQEs/nUVvyAAmEahXtJyE6IXS +gXdIwHV+UugFi7BeRIIzCPg5intx/Qc6HM8eW1AAdqZFK99kEGIPYG+HTcqIC2zE134YM Ber1n2+H+siakrezciUxALTYbC5UPMgNWTWB7MYtmjDp8aXmaxGJ/YK7adFvwwYwKj7r0C jWyObMyMH2PkiLqi0mvBAxrYRJssnpDGdDv6yF2ARtc9mFPU55OmQomqm9cKUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762413184; a=rsa-sha256; cv=none; b=KjcPsLcS5gE/DIPpUak075HPgkt8Hn1FEz/NtSTNivKb054z/oo7yKw/rmaV1LV2lWffmr qciZe9bHiRJeyt4bt9jWalNEHxg45HXpE0Vxhq8LBeQHUl8T8N6S0BVf73wUEN2Xr6K0/u px/9vKsZIMOnIiz4o+MuONSN/rsRow/elIWtjATp0vp3fBh7gAXTN9Ass8J7LYvo65SrrR LnJaYELYBMVj/g8oNmDCil1oDSNtJ/FLtMtuiNTTV6+F5KjrImxMbsvlEKSdB8nCKYecD6 zRadbaSaUmDom9jfY5ptNXLfS7fuo0+mCBpMMB51fRgHuUrhrYUcAeyK86WWNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d2D1D04Vbz1JLT; Thu, 06 Nov 2025 07:13:04 +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 5A67D34n002873; Thu, 6 Nov 2025 07:13:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A67D3e1002870; Thu, 6 Nov 2025 07:13:03 GMT (envelope-from git) Date: Thu, 6 Nov 2025 07:13:03 GMT Message-Id: <202511060713.5A67D3e1002870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: ab0a1169ab6a - stable/15 - cron: Use reallocarray() to prevent integer overflow 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: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: ab0a1169ab6a9cad731c73dad95f0c9af86cdbe1 Auto-Submitted: auto-generated The branch stable/15 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ab0a1169ab6a9cad731c73dad95f0c9af86cdbe1 commit ab0a1169ab6a9cad731c73dad95f0c9af86cdbe1 Author: Xin LI AuthorDate: 2025-11-03 05:59:46 +0000 Commit: Xin LI CommitDate: 2025-11-06 07:12:13 +0000 cron: Use reallocarray() to prevent integer overflow Apply OpenBSD env.c,v 1.24 and 1.25, which replaces manual size calculations with reallocarray() to prevent possible integer overflow. (cherry picked from commit 40d21618382108fefa84f8576b14302f65452718) --- usr.sbin/cron/lib/env.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.sbin/cron/lib/env.c b/usr.sbin/cron/lib/env.c index 287dd8636293..5a2d7ad60756 100644 --- a/usr.sbin/cron/lib/env.c +++ b/usr.sbin/cron/lib/env.c @@ -55,7 +55,7 @@ env_copy(char **envp) for (count = 0; envp[count] != NULL; count++) ; - p = (char **) malloc((count+1) * sizeof(char *)); /* 1 for the NULL */ + p = (char **) reallocarray(NULL, count+1, sizeof(char *)); /* 1 for the NULL */ if (p == NULL) { errno = ENOMEM; return NULL; @@ -112,8 +112,7 @@ env_set(char **envp, char *envstr) * one, save our string over the old null pointer, and return resized * array. */ - p = (char **) realloc((void *) envp, - (unsigned) ((count+1) * sizeof(char *))); + p = (char **) reallocarray(envp, count+1, sizeof(char *)); if (p == NULL) { /* XXX env_free(envp); */ errno = ENOMEM;