diff options
| author | Warner Losh <imp@FreeBSD.org> | 2023-02-16 16:36:03 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2023-02-19 06:47:11 +0000 |
| commit | 711c0ebd83428843cc88bb43bb6b78ef60c7b011 (patch) | |
| tree | 1073f30e347efa7574ed7231104a2035d375d253 | |
| parent | cd475287ee5a24b994cfad80b08c3d2b533b5dd9 (diff) | |
| download | src-711c0ebd83428843cc88bb43bb6b78ef60c7b011.tar.gz src-711c0ebd83428843cc88bb43bb6b78ef60c7b011.zip | |
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)
| -rw-r--r-- | lib/libefivar/efivar-dp-xlate.c | 17 |
1 files 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 |