system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 00:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

efivar: Allow NULL paths in build_dp

Browse source 
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
This commit is contained in:
Warner Losh 2023-02-16 08:53:26 -07:00
parent ccf2121d59
commit 49fd6affdb
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/libefivar/efivar-dp-xlate.c
View file

@ -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) {