From nobody Wed Oct 28 05:52:35 2026 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 4jDxN42gHPz6wrPq for ; Wed, 28 Oct 2026 05:52:36 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jDxN36Ymwz4LQq for ; Wed, 28 Oct 2026 05:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166755; 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=H8gLbZRjd+Lr5gWCn4IL6ZkYiR6Czi/TeSh5zpRQPM8=; b=yC31gE9KWwK/xAdtkri1XLWlzVYwOXPOb8hecIAq7icHUJWTu4BZ6L2/3Mq2mYAzktOynz 2G3EwwCxEeoEylTwNNRkzN0n0eMyNQRi8wPdwxcNO0YrbdeEeSgmiFkgYajSX9k6SWZdN/ AtbE97F0Q7EMliKEr4CMSuVMdmFpu5rTqDu70ct+3y7A+z1gxVrDspVDSiCJ9BHoQYh1b9 pXVuQajliwUvLpnCvuy+QPu7evOsSdohjE3MhVQegM8H7VN2ZaDvoHsn+N1EJk0gichkRS 3YdRAHe+NXZlVTKHOHhNVLxum2XKkQVWWNxcW6r07pCcho6hnU35pVPWsmdggw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793166755; b=Gh1/H7fBDX5YiNb07gNWuRWQaSGF6XxrzbwpGXP6BPbS0A8FPPoJSowPKYtKrNOVrxeFoU g0GC8FeOO91WdHyhtinEXuVXKwbYP/mBnqPKI0sdy67I1Yb1Y915kBJTixXY6RWY16RH3O wjovNfD/rBZX0SSiVQNma8IYifyG0UiYuCkzaTcHev3lmL+dfxMFEHGPof/ZzBdhcq0wBe fFIi6suL3mPgBFmlXyEkjvMTv82hWFj9tz+BNnWqP7Z3WPL0s1EAV+7StNO6kkyFAbX+BL J1daXjsKS6p7c0cU8vI0BjrD3+vqQ00Gn2JJqXh//+qaJH8IGx9wcCZK2RgjAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793166755; 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=H8gLbZRjd+Lr5gWCn4IL6ZkYiR6Czi/TeSh5zpRQPM8=; b=uiNuPYU1YxPyauHlHgY4y68awASjIXL8vZolRAhnKteDCdoL7XE1qcn4OGz0FgVvO/Gm2T GxgG96lHyzDF+lXdw96UTkb77SUxIw7sE6JeDOvzbB85DcduY4Awsv+2TqjsqbXrB2YSfM 2TRr8xBjSpJMa3B+os/VQxBsbSPTs/1Up1oqFg7pAl1bbkWRLN+JIqkCZdyHVnEZFKdOzs 2nHIS/OhH9urh0N1JO2/ffPPL8SQ8E6PFSmN5s/T0qIvn6mnvaOw4uJojDqrb0cTwS7jjg oR0dm9J47kl3Z77BWn01yknSByp/9DGHZ9ifIpHrHeOMrJCDZTJyZr94QmH3kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jDxN35TRwzvws for ; Wed, 28 Oct 2026 05:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36908 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 28 Oct 2026 05:52:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: b3c301c30254 - stable/15 - mkimg: Use reallocf List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b3c301c30254d81524f1b1c54c2c262f25263926 Auto-Submitted: auto-generated Date: Wed, 28 Oct 2026 05:52:35 +0000 Message-Id: <6ae18da3.36908.38dfb14f@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=b3c301c30254d81524f1b1c54c2c262f25263926 commit b3c301c30254d81524f1b1c54c2c262f25263926 Author: Colin Percival AuthorDate: 2026-10-06 20:01:39 +0000 Commit: Colin Percival CommitDate: 2026-10-28 01:13:01 +0000 mkimg: Use reallocf Reviewed by: ngie Suggested by: ngie Improves: 1a0523197c5c ("mkimg: Check for realloc failure") MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60419 (cherry picked from commit 38407c46ded957a2ecb7fe2a0dca6c4ac8e802f3) --- usr.bin/mkimg/vmdk.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 8b16c6b57eae..0eb6292cd229 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -169,12 +169,9 @@ vmdk_write(int fd) return (ENOMEM); desc_len = (n + VMDK_SECTOR_SIZE - 1) & ~(VMDK_SECTOR_SIZE - 1); - buf = realloc(desc, desc_len); - if (buf == NULL) { - free(desc); + desc = reallocf(desc, desc_len); + if (desc == NULL) return (ENOMEM); - } - desc = buf; memset(desc + n, 0, desc_len - n); le64enc(&hdr.desc_offset, 1);