From nobody Sat Oct 03 15:42:38 2026 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 4hxqfX1qMvz6vc4t for ; Sat, 03 Oct 2026 15:42:44 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hxqfX0VMLz4SfR for ; Sat, 03 Oct 2026 15:42:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042164; 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=myluPig76lCGj+X3xwskXG/g287tOoQHrCR+92lpt8g=; b=baRrkOHXkksnwM23Vl21g5uF1P6/iLJbvv8cjjvAmDmfkJLzE/HPm4+uQS21AmpIDIRYaD 88/6MflaDwWgXCg8prmb8LN7tlM6LToyTkmcKtqjufVEnHGZ9NG++GICWDJ0o7M05Fidi/ 2IfoD1QCZVKVd3dwnldg7WRx8SPLGJd18MyuJp9oHa12Cc2Gn1fsS6sldoyVwT+WoRCzZ8 4QVLQa/gQFIB+M80H8CGAL7cbjXOCFMqoLPRZTlIc9SmOeMFxLfP6nMc+9hvOGrDHiYYWQ 8Xyr3FEdtj6oU31AxI3Qvp75l3X0s2ic/iMmtR06+RIzVy/s15361zkyJPxY1w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791042164; b=Lz7EBgY6dhsppez12pGMXw5ub6XOfcODrslNjw0K/5i+ZVSzjNLjBtdslJ05soqOwuMPFX Gc0pyTlAJHYriP63d6M09oxoicyrSw0awkneTptze5RtyANbbWBcdcSgllF5WVedXCX161 nPROEuvMoYXd54Ly3GeZe5Ia1GWdH29RxozQOKWulslGTqnqom1JtHzArv1ViRQLzSoZSB OG5/rsaOHmbtKJOwE6Tq7HSyRstuz15TrE/f7JlDW6Mh5bWVKBrGG6eXEegPDwPHVK3ak1 /hGQ+8JNL2XjFJp2DvXRaBhfxRfVzq/gFQ25BcMbjXrOOpyMKxVPyiloMPBGBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042164; 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=myluPig76lCGj+X3xwskXG/g287tOoQHrCR+92lpt8g=; b=IJJ7oDauAN707Prhx5PRv4AtwiDAAn+xFAgoTHAMdUgaydGd/OF7AfERas15xX+hKJPq4C F6/s6SG+LNIANnkEPrqNXGkcQ6gqGPyDpLU2oTLx3MqZ1VVMK+aZxJW6ZoD6CaTJTvInjk fGHzxF4KCfiPsH6vdxc0enJw4dKVPa7FFqtOQasraScatVVt/ZwOSf4dErM8gBGk+1GJZ+ DSJc2Tl4vL/45F8wulLwy+kxq+xpW/qq+QXNv/39lgEw0sOzuNLCBVuq8zbjGvO/fUKBYc daTEX6JZnfe6OZgUEs1AoQjxF5/4QKD25jybKAeEo5Wrv4ToxV9OkbY8EODozQ== 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 4hxqfW6hHmz181g for ; Sat, 03 Oct 2026 15:42:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41d3d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 03 Oct 2026 15:42:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 1a0523197c5c - main - mkimg: Check for realloc failure 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 List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 1a0523197c5c16ce7bcb79d16c6bf8945258b428 Auto-Submitted: auto-generated Date: Sat, 03 Oct 2026 15:42:38 +0000 Message-Id: <6ac1226e.41d3d.69de7d0f@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1a0523197c5c16ce7bcb79d16c6bf8945258b428 commit 1a0523197c5c16ce7bcb79d16c6bf8945258b428 Author: Colin Percival AuthorDate: 2026-09-25 23:46:07 +0000 Commit: Colin Percival CommitDate: 2026-10-03 15:40:50 +0000 mkimg: Check for realloc failure If realloc fails, clean up and return ENOMEM; don't just copy data into NULL. Reviewed by: emaste Reported by: Claude Opus 5.5 MFC after: 2 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60147 --- usr.bin/mkimg/vmdk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 79ef256df223..339e8413b910 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -133,7 +133,12 @@ vmdk_write(int fd) return (ENOMEM); desc_len = (n + VMDK_SECTOR_SIZE - 1) & ~(VMDK_SECTOR_SIZE - 1); - desc = realloc(desc, desc_len); + buf = realloc(desc, desc_len); + if (buf == NULL) { + free(desc); + return (ENOMEM); + } + desc = buf; memset(desc + n, 0, desc_len - n); le64enc(&hdr.desc_offset, 1);