From nobody Sat Oct 03 15:42:38 2026 X-Original-To: dev-commits-src-main@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 4hxqfR0Xv9z6vcRn for ; Sat, 03 Oct 2026 15:42:39 +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 4hxqfR02mcz4SwW for ; Sat, 03 Oct 2026 15:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042159; 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=knhp0AFdRmBQeN5PF0HRiqJ6106fQ2ndN1e5TtgPOE6H4zWDVq0cX0bS08A6qJsJE/qpbi 3nFJty6di/+tDRUttqrbgd6scn7Y3j45d9MAYVjxPqx7Q6FTIwFNU2c/5SmkODD3cf0Edc c61Xuw5yVAQ9pAGZSp6WdlBIsWLXb8HbqHSArcxcc+KxWfSZmghByOo5cA8mZa23Q3SK3d SO4Jbrg8SR8R6wtdCGiCVtgFhZWd2gtimrAaknk3cPrL7YFjFA5EPCsO1WDuBCcFO3xKAU OfASAP+kNyXq1QxUcu+yWBOEyNC3WbNTaMXnDXwdYVavDcapphHmjs91y8G+Kw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791042159; b=WzsQdoELx25za3qm8BETOWXSy5/16FcnPku62YrCf8cLj8XZz9Zhv1Bt9WIDsV08M8O7Ww iKk6EEvfyU8yFFYYruwliTi34Zt9ey7Ay/lOPVr2DY+/CpDmfIELKvrDFAA4PV2uGThBuY V6Bgc0GrJT600tM07m4BjtIohjEvET3D63+NyqoHlOpR5uY6ARtWaOvApcpCIEu55G1UL1 EaGAMOeBYDhJHMnInqCAOCwB/vC4TfjsyRXOP58AQ8N/PZ83Je8n3Mzy7ttKaxikYOyuIl 0YNhDnetZDZd56yVyZwdgtKvdz4gsy4qHBFrPrcir5X+lKytcuCayKHEpsE98Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791042159; 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=G9cOfUCnAvK/1rXAlz38Tq6RgSW008I5RZqjn6fwL7SeRJWmtCiChoSHOAw9C0fINWnrDh IVhKO+WGOqTqdAsvCx5PWg22JVOhglxbH9BBJTvAride/JQTHFazhzlKVd7DPCY7bB0bE+ TNASbQ+dtGz1bTx5RhCRoMpaN41+cm4EhGQu9qdu+5tAubzwExsZ9ZMDv3eNZePUFflqgH HnjMFw9BZiwK0AW77rPkGUHsk+qJ8i7YhH52BCf96DWeB04ljHX3CUMUwpLF5W0VkRTZhP SaHSfJdpQ0OmQ7dyqO7Qru34yDFQrOK1kQtlU9NBBooKgXWuHp28h1VYriUi8w== 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 4hxqfQ6BvGz18Q7 for ; Sat, 03 Oct 2026 15:42:38 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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);