bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: replace strncpy() with strscpy()

Browse source 
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>
This commit is contained in:
Artem Chernyshev 2022-11-19 11:13:29 +03:00 • committed by David Sterba
parent 26df39a9e5
commit 63d5429f68
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fs/btrfs/ioctl.c
View file

@ -2859,13 +2859,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, btrfs_dev_name(dev), strscpy(di_args->path, btrfs_dev_name(dev), 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();

6
fs/btrfs/rcu-string.h
View file

@ -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;
} }