From nobody Sat Feb 17 19:22:41 2024 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 4Tcdwy3Q1Yz53xg9; Sat, 17 Feb 2024 19:22:42 +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 4Tcdwy1J0zz4Fsd; Sat, 17 Feb 2024 19:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197762; 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=XZdvPa+P0qKHphEx6j7017L1eIdvLQbcb8sWIOgF7d4=; b=w1lFuDqFJeO+cGPB5AQTuhZGk6s38mi1uMtnOpwQoiwvk5fO2Daop1t7q/xwcWjrjt5rAx X2Ifuv6ez1UjAmcm8xItZt4bBCFYrKNWEXESblp1WPNO0cmL3D2Fz/ssj97Y6EeL1eCatZ bCog6+yVvK7Mys0a4Xh/PXorEBG6czrg1iDgDXTsKLR/dNBouVu12jqg7/D0pgZ0jjGG4S 5kAyoi+k25WtjwTnQsFsFH6BD2eGw1IgzGKimlO6k3fKzTYRQgZ6sGJqcDIdJ0VLtmn66C JWKC9K2INP0GDrivPdmT7hGxVwjaiFGN299PzcCAx7uwFAav4Ydwve8YsLZoQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708197762; 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=XZdvPa+P0qKHphEx6j7017L1eIdvLQbcb8sWIOgF7d4=; b=AT6d839UdshNyDyB4antARlcLoEsS04/nmvLpCpoEnHTkofn153mAQo+Cp+ATuBVnAlzYN UI0+QuTjrNe4zBI9Dz/bYXAxAW+Edtk09NgyIDf5BIdasmt3pteGLQky7pgQEtA+VokArf wuZ92Ip4cBDA9rY9xIXsfhUT3S95kqvHgRIQwT5V0URiTLKZbb+aTVPZiw96e/98StPvTo q3KWa2TEX61hAkVwC2rf5QkgotsK/5uuaTbh6xylyKEiSUYKZ4+nvzG0dpcWFaDQCIj+c8 3EkN0J8RJp3fpsVQqIxd/beaP1iO+stX5cl8QveZUVI49ANxDhcylvfAzwk8oA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708197762; a=rsa-sha256; cv=none; b=uswjk6yE29hpXSzu5dH8gliZQON6EyflJuSSmI/mFI/N6tcGKs/tS38hnjZKRqjmXeyHvI 1TaNoOuTxJdeENTdDo4nabQS+D8iuJ9kyhi3qSDXH+3i73hUSrv912nfgZ5TAlbtLCfTVI o0qC9QHs4fiqAeiP3k1ZC+r60NxaYrz8koob10uS1t6ZuKiG9qs4W/gmVQkC4Jvr+q03U4 isf88nQJk12eaDyeAbw5llGIR7EYM5dq58p+88j0ggYPh/pXwM9ymdiaTIUT/MQ5bVJwyv zVJeOgJANwEsUK7cMrbL4JWkj5mM6J+pFt9ndljfzSpYwbboWWfS/6Bs9EUIIg== 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 4Tcdwx75ZVzKdT; Sat, 17 Feb 2024 19:22:41 +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 41HJMfBH000799; Sat, 17 Feb 2024 19:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41HJMf6v000796; Sat, 17 Feb 2024 19:22:41 GMT (envelope-from git) Date: Sat, 17 Feb 2024 19:22:41 GMT Message-Id: <202402171922.41HJMf6v000796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 1b92999e67b6 - stable/13 - efibootmgr: fix potential endless loop with -v List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b92999e67b6cbfa75a9def2a33464080ba33a05 Auto-Submitted: auto-generated The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=1b92999e67b6cbfa75a9def2a33464080ba33a05 commit 1b92999e67b6cbfa75a9def2a33464080ba33a05 Author: Andriy Gapon AuthorDate: 2022-10-25 21:10:39 +0000 Commit: Andriy Gapon CommitDate: 2024-02-17 19:22:08 +0000 efibootmgr: fix potential endless loop with -v I observed the problem on a system with fairly old and, apparently, buggy EFI implementation. A list of boot devices had an invalid trailing entry. efidp_size() for that entry returned zero, which means that the code got stuck looping on that entry. (cherry picked from commit bf87d4a4bfaa86e97079754e93fe14595adf07c5) --- usr.sbin/efibootmgr/efibootmgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 8dcf9876486d..be1157b4aa84 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -784,6 +784,8 @@ print_loadopt_str(uint8_t *data, size_t datalen) */ indent = 1; while (dp < edp) { + if (efidp_size(dp) == 0) + break; efidp_format_device_path(buf, sizeof(buf), dp, (intptr_t)(void *)edp - (intptr_t)(void *)dp); printf("%*s%s\n", indent, "", buf);