btrfs-progs: fix error checking in load_device_info

PATCH New David Sterba 1 participant 1 message Oct 2, 2015 Btrfs file system

Share & tools

David Sterba

author maintainer

2015-10-02 15:50 UTC #0 lore raw

PATCH 1/1 btrfs-progs: fix error checking in load_device_info

load_device_info queries the FS_INFO ioctl and this may fail with EPERM on older kernels. The check did not verify the ioctl return value and incorrectly returned EPERM if it was previously stored in errno.

This fixes 'btrfs fi usage' that will print the overall summary for all users (provided that the FS_INFO ioctl is already unprivileged).

Signed-off-by David Sterba <[email protected]>

---
 cmds-fi-usage.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

cmds-fi-usage.c +4 -5

index 54b8b1c1d996..50d633372023 100644
@@ -504,7 +504,7 @@ static int cmp_device_info(const void *a, const void *b)
 static int load_device_info(int fd, struct device_info **device_info_ptr,
 			   int *device_info_count)
 {
-	int ret, i, ndevs, e;
+	int ret, i, ndevs;
 	struct btrfs_ioctl_fs_info_args fi_args;
 	struct btrfs_ioctl_dev_info_args dev_info;
 	struct device_info *info;

@@ -513,12 +513,11 @@ static int load_device_info(int fd, struct device_info **device_info_ptr,
 	*device_info_ptr = 0;
 
 	ret = ioctl(fd, BTRFS_IOC_FS_INFO, &fi_args);
-	e = errno;
-	if (e == EPERM)
-		return -e;
 	if (ret < 0) {
+		if (errno == EPERM)
+			return -errno;
 		fprintf(stderr, "ERROR: cannot get filesystem info - %s\n",
-				strerror(e));
+				strerror(errno));
 		return 1;
 	}

Signature · 1 line

2.1.3