From nobody Mon Nov 03 06:16:50 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 4d0Lvl0m8fz6DwVd; Mon, 03 Nov 2025 06:16:51 +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 4d0Lvk6VlLz3W7p; Mon, 03 Nov 2025 06:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762150610; 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=g1wfIUWertqYdEyKX/LXsABzRJPrN+QsdDYT/BKc0ck=; b=jvt0bAY3QrpC7GCc0xD6vg9eBYUE6yFqCt0emmIFW9nzvcMH31f5DAiJVDsRWqwACQEnyu PvNTbN9D0wrPeaBZyHvAao2bzCY7eSWXm9YAQ7h9Ajbud5zMsdHZQr0/ZrCizPHqyXbsnl mIFfQ5D41lyhKsm95nk7jIeU5AsuGm9BsUizKYLCro8jUeTGbl5bZWjjw+pcd7tSMg6wb+ xZbvcmCyXiUguq1ab2yJZvd9wN325aWmtUfd/fF24yl6w+tng0o03VnqmBO5OZqeMyZ8Xs NUS/DUIcj/dpUyJzfYJeJo9uzd6sDgTJHyZBQVIbSuHqlZlS8w+nJrmY8+CngQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762150610; 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=g1wfIUWertqYdEyKX/LXsABzRJPrN+QsdDYT/BKc0ck=; b=Kn2YgRzBukRnDOEBCyqtq4rZeA7WL9BNIEh1dfvq7HdZ5PP6GPMttcx7esN7c39AXnnH3n 3tp04/RXIrIvYXBnjO7Z35bWS3Mg3xhnSyiIM7McLvvzzjffeQt9+OuTdD7ZNm5tZdPfTy SP0NVz78AOvGH6mSqY13+9b8qKbMskM5goT/0y6TBjIdSb8DPriFzNnLybrI3YuWk2FBCH shIOFUf+O0GQ6EuneuPSk1BPtfgMKWhxzQbSJ1YNNdUdY7J1mH9Ajl6IfAOSCrI6rnsFu4 HJ2G98KUthjA8nb1VBZX4+0lvdgFaCN4w/dR5ybo8wco1h7gNuWpR9fkt8HMSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762150610; a=rsa-sha256; cv=none; b=lpZzZHLkX4lbjZmzwP2X9R5irBmr0iokDvdAlTP/n+F8zwtiSeVl1Vzxq24WFmkSYt5BIn 8XHXPDSsi4ibh1QZ4lNEkbR/ZypaZypcfx8MX5JpQ4YBjQcpAeveAxwjG3VdWUybKK+Yng ZN1NsRaxMnjMg1iSx6enk9GPW8ppiRXFLHrvYVKcRwgkp4BBjqm3kX3g7/p7lSP3aLkOBM TDAHuvqasbHzEaOWtRsHh3Ey98mTg51sIsVnpYk9QFS66qzqdiSxbPj8q0IUfDE7eSfYGo 2Vh0FpbE6wPYUtEqq8Aspbn1f5vnPLeGxuqm9i/2bDLnIRLmX1kq+sNhvFzyxg== 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 4d0Lvk61FFz10Pq; Mon, 03 Nov 2025 06:16:50 +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 5A36GoSm051581; Mon, 3 Nov 2025 06:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A36GoPB051578; Mon, 3 Nov 2025 06:16:50 GMT (envelope-from git) Date: Mon, 3 Nov 2025 06:16:50 GMT Message-Id: <202511030616.5A36GoPB051578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 40d216183821 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 40d21618382108fefa84f8576b14302f65452718 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=40d21618382108fefa84f8576b14302f65452718 commit 40d21618382108fefa84f8576b14302f65452718 Author: Xin LI AuthorDate: 2025-11-03 05:59:46 +0000 Commit: Xin LI CommitDate: 2025-11-03 05:59:46 +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. MFC after: 3 days --- 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;