From nobody Wed Oct 21 20:48:32 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 4j91b43fRqz6wVBd for ; Wed, 21 Oct 2026 20:48:32 +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 4j91b42cWPz4qtH for ; Wed, 21 Oct 2026 20:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615712; 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=rLBFX3GJbWbMshmkMh/jM8x0Eqh8zFjEBoxM5GbPeVQ=; b=gIgSj5DkaWY0IKxn8aQpstBH5tK9EKGJqiCRlhFydvfkFjGm7YBO2oXnAQVSNZmBrraQ4k XvdsYUGvCjPfv0wCHK9NemOb31U3bW8HCwVwcdJmF0KtHoOim+tQkn0QYEu/vA8klvFwlV bMcKl4EZ4kgRqT0wZd71bEuS00ZHjsfT8iatbg97ocwdlq1iYneNvHDknc4m390kP965nd BLCazzdv7gOuHY1wrKpjmXR9uwN5hKOyMoeQVxJYAAstB/7+kjBZ5MbX0OPnteAlWdmF8f iqUK5rN8685wnr92LeybeBkWKwfWo5ZX5m1dJNT0jZD0YwOWbgUYCcsmOHDaPg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792615712; b=GlETaqcLoGagn00OpTwV/jsQIMZDJSRw2kVa3NwLIYWzL1o79dMKOyIehCV+Xe7l2M2osn tqtyh5glXaVTSqe4dkLYnMJ3rYuarZiSv6RSyPiThUfTR7WAuZaavABp51vm5vuutJNkSY +FUq1kQ+CznB7Uc5PZfbVOsy/dlEead+UVfw+zMb9aOmP1VGgKZnoLF9sbSeTJA1Ou7bqv TvVe9rVdcwMv32kQldu2yawXJ4tXmUPYyPdNDryySPO6e/nJec7xb7a5IyRig0zMrJ9E6+ OqEZUUZSuE/yhOjNU+0hvalyuFGniJCrNwjBHlBvJX3uMFdd8MMbP+vsQsOdww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792615712; 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=rLBFX3GJbWbMshmkMh/jM8x0Eqh8zFjEBoxM5GbPeVQ=; b=JoHmKJcawrsk5TZnNbY3dWIl4BHAW7OkLySRbaaKmkyKqKjWCrT1hKsjKzn/brjsF1I2Xb ULDjNEXCrZq4tGELHFbzdAIofFHHbBGbbWcP4ACQ9YUnkapYCZEZ0vNunu8fUEyl9R557A u2U+/xmYeelXpSrQZ2AkkKD9Agp5QVYNg9HSd5A2AdKUsFIxJ8lpddVMVSNln2G6yocxsj MXR2CtHEqUGQYyfqgStl5YeVB4Xa9amjit084+MtbDfmEVGeVh/DDTzdgo4HCKRY2cxeph 5LWbdpLITnGXsUZ2yYyGwNbhNGtrzEoMMRUQcWzLwFG+GVnTU0tMYO3yne3GDw== 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 4j91b41mybz19c8 for ; Wed, 21 Oct 2026 20:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ed39 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Oct 2026 20:48:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e7f84fe6cfac - main - mkimg: Don't ignore invalid partition offsets List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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/main X-Git-Reftype: branch X-Git-Commit: e7f84fe6cfac2de3471e4912b1ac82023976ccfa Auto-Submitted: auto-generated Date: Wed, 21 Oct 2026 20:48:32 +0000 Message-Id: <6ad92520.1ed39.62159b8d@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f84fe6cfac2de3471e4912b1ac82023976ccfa commit e7f84fe6cfac2de3471e4912b1ac82023976ccfa Author: Colin Percival AuthorDate: 2026-10-06 21:22:07 +0000 Commit: Colin Percival CommitDate: 2026-10-21 19:42:43 +0000 mkimg: Don't ignore invalid partition offsets When handling PART_KIND_FILE, the "error" variable is set to reflect any errors in parsing the specified offset; but that value is then overwritten by the return value of image_copyin. Error out immediately instead. Note that it is not necessary to change the code in PART_KIND_SIZE which parses the size, since in that case we do not overwrite the value in "error". Fixes: 8f3c71c85e5f ("mkimg: Add support for offset if the source is an image") MFC after: 1 week Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D60422 --- usr.bin/mkimg/mkimg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/mkimg/mkimg.c b/usr.bin/mkimg/mkimg.c index 9d8c53e262a3..b727b43683a3 100644 --- a/usr.bin/mkimg/mkimg.c +++ b/usr.bin/mkimg/mkimg.c @@ -504,7 +504,7 @@ mkimg(void) else offset++; if (expand_number(offset, &byteoffset) == -1) - error = errno; + err(EX_IOERR, "partition %d", part->index + 1); } /* Work out exactly where the partition starts. */