diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-12-18 18:10:46 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-12-20 10:28:13 -0500 |
| commit | 39e51a34881c4b02aecf2d98f2e9bdd350dec234 (patch) | |
| tree | eed2562e2c5e8ee90b8474ed07d7bb2b6a4cafd4 /src | |
| parent | b5a7205f6edc5525dd2ee0a91bb051dabcd331d9 (diff) | |
path-util: fix breakage in path_is_mount_point
This fixes 2 problems introduced by 6feeeab0bc:
1) If name_to_handle_at returns ENOSYS for the child, we'll wrongly
return -ENOSYS when it returns the same for the parent. Immediately
jump to the fallback logic when we get ENOSYS.
2) If name_to_handle_at returns EOPNOTSUPP for the child but suceeds
for the parent, we'll be comparing an uninitialized value (mount_id) to
an initialized value (mount_id_parent). Initialize the mount_id
variables to invalid mount_ids to avoid this.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/path-util.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/shared/path-util.c b/src/shared/path-util.c index c0ffacdfeb..a94de4af81 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -319,7 +319,7 @@ int path_is_mount_point(const char *t, bool allow_symlink) { .handle.handle_bytes = MAX_HANDLE_SZ }; - int mount_id, mount_id_parent; + int mount_id = -1, mount_id_parent = -1; _cleanup_free_ char *parent = NULL; struct stat a, b; int r; @@ -334,7 +334,11 @@ int path_is_mount_point(const char *t, bool allow_symlink) { r = name_to_handle_at(AT_FDCWD, t, &h.handle, &mount_id, allow_symlink ? AT_SYMLINK_FOLLOW : 0); if (r < 0) { - if (IN_SET(errno, ENOSYS, EOPNOTSUPP)) + if (errno == ENOSYS) + /* This kernel does not support name_to_handle_at() + * fall back to the traditional stat() logic. */ + goto fallback; + else if (errno == EOPNOTSUPP) /* This kernel or file system does not support * name_to_handle_at(), hence fallback to the * traditional stat() logic */ |