From a2a598f6ea9c2952993aad669b1313f7f1990c70 Mon Sep 17 00:00:00 2001 From: Stefan Behrens Date: Mon, 19 Mar 2012 16:17:22 +0100 Subject: [PATCH] --- yaml --- r: 299813 b: refs/heads/master c: 99ba55ad696944b37d5557bc5b4816890854fdb9 h: refs/heads/master i: 299811: 4b8fb6f6b9ae7d163bf53abe25cdefc80ce3ca5a v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ioctl.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0ed2d737e450..b7e5ac7f8286 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9688bb8459b67e42327de6420edb405a9188775 +refs/heads/master: 99ba55ad696944b37d5557bc5b4816890854fdb9 diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c index 18cc23d164a8..14f8e1faa46e 100644 --- a/trunk/fs/btrfs/ioctl.c +++ b/trunk/fs/btrfs/ioctl.c @@ -2262,7 +2262,10 @@ 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)); - strncpy(di_args->path, dev->name, sizeof(di_args->path)); + if (dev->name) + strncpy(di_args->path, dev->name, sizeof(di_args->path)); + else + di_args->path[0] = '\0'; out: if (ret == 0 && copy_to_user(arg, di_args, sizeof(*di_args)))