From nobody Sun Feb 19 00:48:38 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 4PK6P253skz3s8vb; Sun, 19 Feb 2023 00:48:38 +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 4PK6P24P6Qz431W; Sun, 19 Feb 2023 00:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676767718; 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=j67+wlYgoy/Vw/5MakF+rhjcv259cn/3PRH3ma3Eju8=; b=mwDa59XodMIbiuYhUNZvxZgeIca5z99qBfq+rjUS8qWlrH6tP39CqfREq89rplyrOInrJI WasgZbZkthD6y+1lWO4ecjhj9y/b9Za+JaqLHMEWlLX3G/1EzxEAjN3j0iNN14b0Q8i7Q8 yJWDDDeq2Cync4zl9o0C1Yb1mJgQHstyEJESKSSLXC/U0s0VeX9PXtU3tk1A1RJj7OJwsj Pg9M2iGgiHLD5ZOwjwJVEM16Z8bQs+cadt6twCDt/gsJ98T1tcICnMdWYsy8aIHe3Apzd6 eqPToAh2uJE63XzdhyOjrK4JdE5TwsZEANVWJ8dCFkXnzus39ivfhXah8nAgtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676767718; 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=j67+wlYgoy/Vw/5MakF+rhjcv259cn/3PRH3ma3Eju8=; b=Ai2iQKt7Tifvai7/wBQytuzR5/XqQrTNU1UnIhkLyuZts9hQtOssIuKp86C1dxsZVPfad4 vACC90XGGd3LMZvB/k/lPltRSeIbO9tXzn1YFMph/TXyLEz0fqHcyRskVp8+T4ev7ElUMb poGc/r8OFdBgK3MS5PXVZjueL12MOp8AX3Q95M5xq3wIy/5TOimOWGDrsI0bxCEPuaRJCn Z53uu2+07Nr3DizD+v+vcUN0MjkFz24INJ0jOUcbZYQHcqEI9SV3mDq5eR1AQdcRTNTNR5 V8O+I2SxLhtV0xjGftQHaOAm02kHR8aVUOHkQsrXjFku3tlVjtGpbyjFUflrUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676767718; a=rsa-sha256; cv=none; b=olo0oC9uKbW1XnicmYg+EO4Wf7nzwJsuCLLLbRXW09yMZ/TDvQhAFXM3uczy2p7QWTlYVr uUqCSO4980OF3EUEzS9oRjuuX8kbjWyb8MS/dDxflR8jhpVxRVbB3E1WNc1Z+JcJyeWBMk yXq0cFILwqaJLYO99MNY8BCx7mzfnxDu+2R42K/4BCP8YAgPPv3fTsrCslUPxcfu+Q5SJy 5IaHX0lnkmLU+2moGzaAsVXaQWk8yQ2m/i8SZ0syf9PFagE5igEg3S7aQgzt5hXy+1WyCV cq9hjshMfacbhEGaxZDLzQDHKnChnKjHVpEvtMI6yCh3Fz664sJIK5cFZO3zhg== 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 4PK6P23VFvzj9L; Sun, 19 Feb 2023 00:48:38 +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 31J0mcbS069601; Sun, 19 Feb 2023 00:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J0mc77069600; Sun, 19 Feb 2023 00:48:38 GMT (envelope-from git) Date: Sun, 19 Feb 2023 00:48:38 GMT Message-Id: <202302190048.31J0mc77069600@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: 82c0aea8f3c2 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 82c0aea8f3c270c6d20b093cf711d4bb1472237c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=82c0aea8f3c270c6d20b093cf711d4bb1472237c commit 82c0aea8f3c270c6d20b093cf711d4bb1472237c Author: Warner Losh AuthorDate: 2023-02-16 16:36:03 +0000 Commit: Warner Losh CommitDate: 2023-02-19 00:46:57 +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 (cherry picked from commit 49fd6affdbfe6af53f119ebb27ff5e5e292e1f67) --- 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) {