btrfs: replace strncpy() with strscpy()
[ Upstream commit 63d5429f68a3d4c4aa27e65a05196c17f86c41d6 ] Using strncpy() on NUL-terminated strings are deprecated. To avoid possible forming of non-terminated string strscpy() should be used. Found by Linux Verification Center (linuxtesting.org) with SVACE. CC: stable@vger.kernel.org # 4.9+ Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b5db135457
commit
839f3ca8bc
fs/btrfs
@ -3299,13 +3299,10 @@ static long btrfs_ioctl_dev_info(struct btrfs_fs_info *fs_info,
|
|||||||
di_args->bytes_used = btrfs_device_get_bytes_used(dev);
|
di_args->bytes_used = btrfs_device_get_bytes_used(dev);
|
||||||
di_args->total_bytes = btrfs_device_get_total_bytes(dev);
|
di_args->total_bytes = btrfs_device_get_total_bytes(dev);
|
||||||
memcpy(di_args->uuid, dev->uuid, sizeof(di_args->uuid));
|
memcpy(di_args->uuid, dev->uuid, sizeof(di_args->uuid));
|
||||||
if (dev->name) {
|
if (dev->name)
|
||||||
strncpy(di_args->path, rcu_str_deref(dev->name),
|
strscpy(di_args->path, rcu_str_deref(dev->name), sizeof(di_args->path));
|
||||||
sizeof(di_args->path) - 1);
|
else
|
||||||
di_args->path[sizeof(di_args->path) - 1] = 0;
|
|
||||||
} else {
|
|
||||||
di_args->path[0] = '\0';
|
di_args->path[0] = '\0';
|
||||||
}
|
|
||||||
|
|
||||||
out:
|
out:
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
|
@ -18,7 +18,11 @@ static inline struct rcu_string *rcu_string_strdup(const char *src, gfp_t mask)
|
|||||||
(len * sizeof(char)), mask);
|
(len * sizeof(char)), mask);
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return ret;
|
return ret;
|
||||||
strncpy(ret->str, src, len);
|
/* Warn if the source got unexpectedly truncated. */
|
||||||
|
if (WARN_ON(strscpy(ret->str, src, len) < 0)) {
|
||||||
|
kfree(ret);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user