From nobody Sun Feb 19 06:48:25 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 4PKGNB1RzXz3sqqZ; Sun, 19 Feb 2023 06:48:26 +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 4PKGNB0J9Rz3jJc; Sun, 19 Feb 2023 06:48:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676789306; 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=czW7vTZOBA5h1pId4uXmqubM6EyUCq0vErSeLvhZNj4=; b=CedqDT83J2LXbGclvbotAtdkHO2DABsvIswKqXB1f74cOAPP5cGZRLyV50Gs7xiu71hdJ0 N+8WBCnaWhhUgse5eooH2leyiMA0vY0WUNmA00ucs2KWX6t8rxZf2oKmysBuIl/f4l091/ /MtOOhA9bdfpbcrVaIrsYNsE7TRf4WnFGhOS4XygRW4CdyGfOg1f/huzZRi17upgbOEi9s hdof5suOU9tMpDg0O2+UZRSDX5b/h3ZvKOdBXpjbcDSm/6uwbUQv0QArthAB1AORihdhaa dmMvfaozGmY6sGMArbgSVRuUDHs1Hiivw2DMMBE5g4n8OlWDdWh00lihFq8QMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676789306; 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=czW7vTZOBA5h1pId4uXmqubM6EyUCq0vErSeLvhZNj4=; b=EIg8M2PbmeqJfq5/Z61K3HUb1jmZ7tnacSi3ryW3DZrY2qFjOHa0SKHEZwHUpGiIwq/g9V EESHGhBo/99gqzRK+K6AnEcrucZHWywdcph7F+zWQrUkQXZ3lzpSkT1gWHu733CkNy9MHE rCHlSeZ8/DGdbxN8IvJuoZV2nRhMP8z2rK8mN52rKgYPpTBNtCNLt+3AVQzH9/gvxKPHNU bVqlgPcHLGOTgIsUl9VGZ1IPw4NsQctPVc7qD3hcC+FgfAFO2c3Z8ljcvKDT6smuTRbz2O WvlxkQLBL0VFI1APrXFQfo52Lmpcs/zalqkx+IhK8vCtJuIC9TCzykF6UNR6tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676789306; a=rsa-sha256; cv=none; b=SrQemRYOjF914zRD/qGzsONu8jmbOL6Z1vwkBW24+ZoPgCpx4MZlW5DQZxskdWtGBZ6/iv 9Djx3VMzDyA7sHgC8MjZJWQADMQRlVcG7/O13j4P2JpZfNinqcqm2yiqqbl876X1lJ73dX K4nqvqP7gkyTQgwhuKWWpVRUlRXsJAbm7TC7jcU4Bh7rPazXvq9bTB40TxbA8XXSc0h10C VhYpmbu1N9GsAkNmuCrqGsEAeIyIDkRnVjZKlCdh35q7EwvlBpxoPA+wyL/a/lG4WWp+Qe iwjjoUVFrrNZsHQ6v2GZZxUZZ3C7mPijod+B/xdEfDQWW7Oou9bg5tVS7Fr1+A== 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 4PKGN96WCgzs5m; Sun, 19 Feb 2023 06:48:25 +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 31J6mPEE082607; Sun, 19 Feb 2023 06:48:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J6mPIC082606; Sun, 19 Feb 2023 06:48:25 GMT (envelope-from git) Date: Sun, 19 Feb 2023 06:48:25 GMT Message-Id: <202302190648.31J6mPIC082606@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: cd475287ee5a - releng/13.2 - efivar: Allow NULL paths in build_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: cd475287ee5a24b994cfad80b08c3d2b533b5dd9 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=cd475287ee5a24b994cfad80b08c3d2b533b5dd9 commit cd475287ee5a24b994cfad80b08c3d2b533b5dd9 Author: Warner Losh AuthorDate: 2023-02-16 16:36:03 +0000 Commit: Warner Losh CommitDate: 2023-02-19 06:47:04 +0000 efivar: Allow NULL paths in build_dp Allow there to be NULL paths in buildp. This lets us return the device path to the partition, as well as to files on the partition. Sponsored by: Netflix Reviewed by: corvink, manu, asomers Differential Revision: https://reviews.freebsd.org/D38615 Approved by: re@ (cperciva) (cherry picked from commit 49fd6affdbfe6af53f119ebb27ff5e5e292e1f67) (cherry picked from commit 82c0aea8f3c270c6d20b093cf711d4bb1472237c) --- lib/libefivar/efivar-dp-xlate.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/libefivar/efivar-dp-xlate.c b/lib/libefivar/efivar-dp-xlate.c index effc8a2de475..b6adae80fdb4 100644 --- a/lib/libefivar/efivar-dp-xlate.c +++ b/lib/libefivar/efivar-dp-xlate.c @@ -544,23 +544,25 @@ find_geom_efimedia(struct gmesh *mesh, const char *dev) static int build_dp(const char *efimedia, const char *relpath, efidp *dp) { - char *fp, *dptxt = NULL, *cp, *rp; + char *fp = NULL, *dptxt = NULL, *cp, *rp = NULL; int rv = 0; efidp out = NULL; size_t len; - rp = strdup(relpath); - for (cp = rp; *cp; cp++) - if (*cp == '/') - *cp = '\\'; - fp = path_to_file_dp(rp); - free(rp); - if (fp == NULL) { - rv = ENOMEM; - goto errout; + if (relpath != NULL) { + rp = strdup(relpath); + for (cp = rp; *cp; cp++) + if (*cp == '/') + *cp = '\\'; + fp = path_to_file_dp(rp); + free(rp); + if (fp == NULL) { + rv = ENOMEM; + goto errout; + } } - asprintf(&dptxt, "%s/%s", efimedia, fp); + asprintf(&dptxt, "%s/%s", efimedia, fp == NULL ? "" : fp); out = malloc(8192); len = efidp_parse_device_path(dptxt, out, 8192); if (len > 8192) {