From nobody Fri Feb 23 02:37:12 2024 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 4TgvL05L1Yz5BTMb; Fri, 23 Feb 2024 02:37:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgvL04nRLz4Yyw; Fri, 23 Feb 2024 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708655832; 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=rGXpT9k09ca0osKR4skDG3jw/PxwyvX8FVPqwUUrcJA=; b=iJcMk53JKwCQbWrOHOAc7aW87AH9KUKWO6LhJSweZS/WuypEWdLKCsY3sqUQ5DXAeZlK2L wPUEtZPmNVYO48RKGFavlrM1sHA2t1bxqvxBvJlmSGh8zDVkc7xia7kxRf48RL7efGPchA gBlpr7fXx5kse8fss8Hvn9msE08QKmmCPL4zcfbQimKwBXkCzRc+I7XWvOh3hM77XBplad Kfihf+6whLOsjwwscMQ9JKkGMR3VmlGxkAReVPjddmKna6NedkJyFhWaDgJULmhYvQ36G2 OUphRLEa/STMHC5BRy3BPcgnB3DGmsX7VIxz3+rxBZzAm/MPj4ndqrgVehEhWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708655832; 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=rGXpT9k09ca0osKR4skDG3jw/PxwyvX8FVPqwUUrcJA=; b=jnKyU7VtRbcLqVwHrOEvo7jPADyD5SvJ1vJufGQaiD7B+eb/LEywQxL76CRrP4FYU7/dyA GljlANUCZXf9zRrrhfh9oxvF1C+GTOkmN5sWlMKkIbghVrTKoQ8GDBzmBKD8aQBv9bWfgL lywPATMQwVNWu+viToFMxXcDqU/rKL4F+rzhYaWG/acOOQ9Zq6+mtS1SpzVFusNJCLau8m R5zYGdMA4HkImOfD6FW/habCIwL+Lm2DTzBWH2kHQpyPZ0N+V45G6PYPkz9p+0msvjvHiV pkivPZTsY0aEyT6b8x/P5kKA+9w+0p7Vpt4vj8Vd9HJZ3iO2pbFee3EpUDSXnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708655832; a=rsa-sha256; cv=none; b=bWCTvIPdOLr09WyACja/nFKz44Jb4YTvPr0x2qSAw3YElRJHtYppcONJ3PKo7ZD8uL7OQQ TZx1weKbpTElASM0IeDxUxtFXgbCoyUHPawWbQQfDAh4EGR9998B63W16fhFLRxl5DJXWT fgto2gJxzDqc3+k93RW8XVu36Hh5RhSR9U9lmOFHkLAUayGmQyl2uzCTCM2evrVLSeEjvP bmOY4ywNxbugaKtmlRGGQniN+hbdob9HGsb3+R5mbeF5ZtaOBHw4ZnYxBSts6nudgTj8tM pjM5qymRKwXLFCV05xhhYcjhoIkMKmaNHLvXiS0u/lV0CcNzegVwEFMVALVq0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TgvL03qn2zxyl; Fri, 23 Feb 2024 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41N2bCG5046115; Fri, 23 Feb 2024 02:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41N2bCB1046112; Fri, 23 Feb 2024 02:37:12 GMT (envelope-from git) Date: Fri, 23 Feb 2024 02:37:12 GMT Message-Id: <202402230237.41N2bCB1046112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 09cb8031b43c - main - efibootmgr: Simplify make_next_boot_var_name and fix cnt == 0 case 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09cb8031b43c8e98abb5ff9b43ff649031d1e808 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=09cb8031b43c8e98abb5ff9b43ff649031d1e808 commit 09cb8031b43c8e98abb5ff9b43ff649031d1e808 Author: Jessica Clarke AuthorDate: 2024-02-23 02:36:21 +0000 Commit: Jessica Clarke CommitDate: 2024-02-23 02:36:21 +0000 efibootmgr: Simplify make_next_boot_var_name and fix cnt == 0 case If cnt == 0 we access element 0 unconditionally, which is out of bounds, and then if that doesn't crash and happens to be 0 we will access element - 1, also out of bounds, and then if that doesn't crash will add 1 to whatever junk is there and use that for the variable. On CHERI, though, this does crash. This code is also overly complicated, with unnecessary special cases and tracking more state than needed. Rewrite it in a more general manner that doesn't need those special cases and naturally works for cnt == 0. Found by: CHERI Reviewed by: imp Fixes: 1285bcc833a3 ("Import Netflix's efibootmgr to help manage UEFI boot variables") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44029 --- usr.sbin/efibootmgr/efibootmgr.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 7bcb4674586b..2bc79ee26f51 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -561,7 +561,7 @@ static char * make_next_boot_var_name(void) { struct entry *v; - uint16_t *vals, next_free = 0; + uint16_t *vals; char *name; int cnt = 0; int i; @@ -579,21 +579,14 @@ make_next_boot_var_name(void) vals[i++] = v->idx; } qsort(vals, cnt, sizeof(uint16_t), compare); - /* if the hole is at the beginning, just return zero */ - if (vals[0] > 0) { - next_free = 0; - } else { - /* now just run the list looking for the first hole */ - for (i = 0; i < cnt - 1 && next_free == 0; i++) - if (vals[i] + 1 != vals[i + 1]) - next_free = vals[i] + 1; - if (next_free == 0) - next_free = vals[cnt - 1] + 1; - /* In theory we could have used all 65k slots -- what to do? */ - } + /* Find the first hole (could be at start or end) */ + for (i = 0; i < cnt; ++i) + if (vals[i] != i) + break; free(vals); + /* In theory we could have used all 65k slots -- what to do? */ - asprintf(&name, "%s%04X", "Boot", next_free); + asprintf(&name, "%s%04X", "Boot", i); if (name == NULL) err(1, "asprintf"); return name;