From nobody Sat Oct 17 17:08:36 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 4j6SvF4611z6wS5S for ; Sat, 17 Oct 2026 17:08:41 +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 4j6SvF2h2rz4VNB for ; Sat, 17 Oct 2026 17:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256921; 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=pqOWC3uvbahd1xEpwsggHQhh7iVbEA08MKODX/++9rRneDqkIloRO4WgFKGb+6vL6OigqJ MiqUjlHpmJlmvkeEfVvS0OGqLtB2hKyGvU23lAWBx6pIXcehZFkge3OQbVDKQzEkTevw/P 4TrhzQV5y+i+GccNEEdSzBIsl1UHIamv7FLeV9d1qRQtI+/88q1PmurFL0V6QmVmlBxtir DdnxK9qEqJozrYwVSCLreMWGsUK0VTPlN50U72TAnPEvpzlp4h4EqWMaBwZe3ccSwObbQl 8BL6uJALOJaM3xA0kBV0v+q7YWp1I7KZhHLZSyzGfZ/g2G4djPkAESqAN37FAw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792256921; b=r40MQSFCk/zMYqBH1q01wu0/DcLWTMAXGvQzaJy5AjRu3VGYWUcDBv5Y1/VD5FS5XyfB3q miAsPiHfwsbTcR2GOdFv6yuo6We4vUmogvrvjhy4MnbH8+fDv8PfH25Xg+CNSzi7TUvGmu HBXNHmF9yZLI+U3vTvuvyX4sAfLFy1Wk8tAknTpvKDTaNSRRRT/RLPERA3bijM8NLzxPcW RFhjTs9GuZE1Gv5irSKOZXAKPYThDd6saQ8JutBW9MLZWOa6myWqMBoCkN4NZzOxM8d6DK /oizRf6kM54X7jpnrPVcQrSU/pYq9Mxw7hTWlbFZvtN6Fd9TG0xAfUL9uiRMBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792256921; 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=AioPCWTNKeP+7mnhoJAZO4zUiSe8fu74F5IQqHb/nGZZ1sXJqh03XjqmizE/uZCu2qvp4f Z9+KZBbQMcx4fgQL2akW09vWE8Rc7SodALNqF7M5U8sB3Vmyk/kckMSd/pY7IzQPzLq1OZ 0S1sszl93OoX6fIyy1oZVaunTdEyywZ0x9fE/X7Lx0egFri+ITbq8Ab4mMas083Y7vewNV zZ0RM0a1g2SAq4J1mUl+RJ04FHOm4SN0jQygNPyiV22kwBoJDsVpX+9j1Ho9Ugjzah0yNx BjfNjBoOTCxanTCfEyEKLmEahfiS3daIN/vkOak/oVgL+D28dHSENJulIcIL8Q== 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 4j6SvF29gcz1B2h for ; Sat, 17 Oct 2026 17:08:41 +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-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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);