Skip to content

Commit

Permalink
Btrfs: NUL-terminate path buffer in DEV_INFO ioctl result
Browse files Browse the repository at this point in the history
A device with name of length BTRFS_DEVICE_PATH_NAME_MAX or longer
would not be NUL-terminated in the DEV_INFO ioctl result buffer.

Signed-off-by: Jim Meyering <meyering@redhat.com>
  • Loading branch information
Jim Meyering authored and Josef Bacik committed May 30, 2012
1 parent f07c9a7 commit a27202f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions fs/btrfs/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -2263,10 +2263,12 @@ static long btrfs_ioctl_dev_info(struct btrfs_root *root, void __user *arg)
di_args->bytes_used = dev->bytes_used;
di_args->total_bytes = dev->total_bytes;
memcpy(di_args->uuid, dev->uuid, sizeof(di_args->uuid));
if (dev->name)
if (dev->name) {
strncpy(di_args->path, dev->name, sizeof(di_args->path));
else
di_args->path[sizeof(di_args->path) - 1] = 0;
} else {
di_args->path[0] = '\0';
}

out:
if (ret == 0 && copy_to_user(arg, di_args, sizeof(*di_args)))
Expand Down

0 comments on commit a27202f

Please sign in to comment.