From nobody Sat Oct 17 17:08:36 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 4j6Sv82Vswz6wSLp for ; Sat, 17 Oct 2026 17:08: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 4j6Sv81vxXz4V3G for ; Sat, 17 Oct 2026 17:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256916; 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=O1dL/O0Rpc9wq20WpfToK/6A+huuXn7yAAfp4AFEMsc=; b=hEUpWe4L/xVXy9VqMRCAB1Mm5NWWl/a+oAgiD29Eg3COUF9guzbzM1zU+4zzr1ExkWkDMb FQ9RG7IMLY5uI73G8x/Is7nM7LYsD667rM3nVHq6PC8i79xMDf+V84HqwFEYrw+rCoAKyi hXSsqVVtZgJlVZJQlZmiXA0H2RHQ4lV46VMwibFOvzfkJ9OfMCdCsZVDkz4NzAWmaTBYQX O7OusfPrVUnzgu9efqtcK1BhA9UH+VB4NrfqDZQK3XpcKSiB6qTVwTJAim1YPAuMauc7PF g3Di3b/NEbn71XZUOYMHwd/Unr+ZBi3pP/XutWwaH0y3ksL2hX0+uUr41p8qjA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792256916; b=N3WtfZWbRsm+XvRQrHLjitTTOBijBQNWE4PqC6uvhQFmfyiXeTkKkxYEAfYTm3Jycp0lry edMp+2y3S7fvwyW/rMa+KFHonHf8RmXtt4wdUoi+NEa+zTFS1g/4VhrxE7Xh5/Lb0HhfYQ Ff9HfBLQCrzMH1NeFGSTt3d7aSV0v1KWchvnUNDGKqWjWjabo4JPPwEV6YNqM8pnhwMpUi uXMnaQzt5TBfsFRL4is+J+gI96rKv30YlXtVG6TfEW+typrlS1MiGdqWFfV/NUnRtUsu3v C8zhfMKGawTEOFTfMA9zMyTb5kvYTku2J23MBCTIZWi0zCZzT0qjinapfVr4nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256916; 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=O1dL/O0Rpc9wq20WpfToK/6A+huuXn7yAAfp4AFEMsc=; b=Q6t6VmhdO3SLT88z4OvcF67aeRgoGVdMesjIF9+Xqu2mrqLQJsnk0ySQgST32sIyreTPN9 NcNCU1LyIEf2K4WLu3PGOPam8fbAC/NVgynq48Xhhixbmq6zHdtEYtfR0KE6eWJjT8zsmZ dDYDDjBQl/xEJC6xeTXzb5pn0/YQyFNEqJXIyaaRFCpTCaOV/RZxrF2iPd2JRkO4Pu9lel gAIzvv/pina6FWtkUkbp1DGZ0RnanxjqIpqf9lzkN3oyjcAKSXjdGwfz8xfdMul0djC5RV HbMbhV4TdItkoh+cVzjKzbfoIudGcW2wW/qXVFImxMGgq0ldwp+x9uvjKU1fzg== 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 4j6Sv81ZNBz1B2c for ; Sat, 17 Oct 2026 17:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c0aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 17:08:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 4e9d2e743f9f - stable/15 - mkimg: Check for realloc failure 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: 4e9d2e743f9f266a63dc8d43fd3022959d2537b1 Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 17:08:36 +0000 Message-Id: <6ad3ab94.1c0aa.2362321c@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4e9d2e743f9f266a63dc8d43fd3022959d2537b1 commit 4e9d2e743f9f266a63dc8d43fd3022959d2537b1 Author: Colin Percival AuthorDate: 2026-09-25 23:46:07 +0000 Commit: Colin Percival CommitDate: 2026-10-17 17:02:26 +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 (cherry picked from commit 1a0523197c5c16ce7bcb79d16c6bf8945258b428) --- 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);