From nobody Sun Feb 19 06:48:26 2023 X-Original-To: dev-commits-src-branches@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 4PKGNC2h70z3sr8m; Sun, 19 Feb 2023 06:48:27 +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 4PKGNC1FmCz3jX0; Sun, 19 Feb 2023 06:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676789307; 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=AlkOIgOPX1rxLe2sLiPOqWraX/6GAG0yC1lTHmsO5Ok=; b=tPnF1P/hIf5KontlsayTp/Myg2+Goza2SVtPhVbmq6ePX8lrwyNEnz5jm21CdnLy5+HlQg j9n94tOybAuiUP8AkvxI+iNNVoePs8htZF+QH8IarGNZTshj07amW3GR6gvbnk8fQIC60W JWzKGbX+d5bQ4KIY18hYVfmhJdpuGEyn8TatC3kLd2gneMsBW0NoDwrFfQ6GAxHysQG6gb DkX1fzJ0L1eRbWc9uXz5q7Sd1TIZGu9xp6bFLg6oGHQawEmqp8zDn+F1r/tTsTQ0iw6cve rMuCWH+X274afZK3joxYF/kiFZEV9YBY4viNDLmuQiGzujaoQzlfAb84w+UaLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676789307; 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=AlkOIgOPX1rxLe2sLiPOqWraX/6GAG0yC1lTHmsO5Ok=; b=W4hIKPl3Q8/8Tm4T2cSGc//+bpsX69xWxVrfa9nLj7KFLxe9h8zoerRLN3+dnCKwuByTi3 8/K3l5UI25Qxmovr5ANo4chMNbcgz1QxXf7aWYqXATdT6LHE3npp27vgIvy/hc5gSv9dGQ OdKV5isDa0XqiW/WaJHiZVhCo7xSeOdQvN7cfo8JTx0iFnOf021EJ+CqKRwD3BR3QibI+n TpYj5WfGaAXHp3D3M2/Lc7X5OFQawXI2VOwJKNTrHKyIMGx7S04a2k6oFwzHIHXwvFM6Uz 80z7ELIjL1KTw6WWysrlFg8sw8PO6IEObJmPqxPuy0k5U2xBtxWw5baN5MazQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676789307; a=rsa-sha256; cv=none; b=BmT2IF9wmjtCgX8BulE5PKv2kTlyj1FnNtlJJJp8jHXJ7yWMPhBAw/WdwavCyw2vbtqNkI lgUGqKPuCULr7SU+Jy2vIrDMblPi2fYWW2zi0wvfh2qpcFL70M4bjryG992Hw+dTuvxgML VgGP4+NAUK8jLm49OGE42/GVDVgsKBWotDhF9MJNJ69mx3dbOvC9U27PPVkdOY7IMw59xK JC1BmWBvgLrtNyf7yi787oCAm1T4MXp9EPbtRfWVIv/GNE3VvdimZw7MmA1UvrcE9yLrnM Xt4BBHZbK/8jPuA85on/EW4RLpocc8OhnEE7zPpCmjgTP+YTPuW9SkBiMs3bZg== 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 4PKGNC0Lpqzslm; Sun, 19 Feb 2023 06:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31J6mQhj082630; Sun, 19 Feb 2023 06:48:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J6mQ6j082629; Sun, 19 Feb 2023 06:48:26 GMT (envelope-from git) Date: Sun, 19 Feb 2023 06:48:26 GMT Message-Id: <202302190648.31J6mQ6j082629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 711c0ebd8342 - releng/13.2 - efivar: support device paths as well as mounted paths in path_to_dp List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 711c0ebd83428843cc88bb43bb6b78ef60c7b011 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=711c0ebd83428843cc88bb43bb6b78ef60c7b011 commit 711c0ebd83428843cc88bb43bb6b78ef60c7b011 Author: Warner Losh AuthorDate: 2023-02-16 16:36:03 +0000 Commit: Warner Losh CommitDate: 2023-02-19 06:47:11 +0000 efivar: support device paths as well as mounted paths in path_to_dp In path_to_dp, allow passing in either the actual device path "eg /dev/foo/bar" or the path where the device is mounted (say /mnt/baz/bing). In the former case we'll assume the path within the device is nothing (the relpath). In the latter, we'll take from the mount point on down as the relpath. Sponsored by: Netflix Reviewed by: corvink, manu, asomers Differential Revision: https://reviews.freebsd.org/D38616 Approved by: re@ (cperciva) (cherry picked from commit 57d5ca4eeba6192e91044aad86fca4429966cfac) (cherry picked from commit bae5c36257ec5289631abf49b33a4041acc84e3c) --- lib/libefivar/efivar-dp-xlate.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c index b6adae80fdb4..586ba7d08180 100644 --- a/lib/libefivar/efivar-dp-xlate.c +++ b/lib/libefivar/efivar-dp-xlate.c @@ -648,6 +648,7 @@ errout: } /* Handles /path/to/file */ +/* Handles /dev/foo/bar */ static int path_to_dp(struct gmesh *mesh, char *path, efidp *dp) { @@ -667,9 +668,19 @@ path_to_dp(struct gmesh *mesh, char *path, efidp *dp) } dev = buf.f_mntfromname; - if (strncmp(dev, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) - dev += sizeof(_PATH_DEV) -1; - ep = rp + strlen(buf.f_mntonname); + /* + * If we're fed a raw /dev/foo/bar, then devfs is returned from the + * statfs call. In that case, use that dev and assume we have a path + * of nothing. + */ + if (strcmp(dev, "devfs") == 0) { + dev = rp + sizeof(_PATH_DEV) - 1; + ep = NULL; + } else { + if (strncmp(dev, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) + dev += sizeof(_PATH_DEV) - 1; + ep = rp + strlen(buf.f_mntonname); + } efimedia = find_geom_efimedia(mesh, dev); #ifdef notyet