github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of strlcpy()

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@huawei.com>
This commit is contained in:
Robert Baldyga 2024-05-11 00:30:56 +02:00
parent 5c4b5634cb
commit 9fc5e39349
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/cas_cache/exp_obj.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright(c) 2012-2022 Intel Corporation * Copyright(c) 2012-2022 Intel Corporation
* Copyright(c) 2024 Huawei Technologies
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <linux/module.h> #include <linux/module.h>
@ -476,7 +477,7 @@ int cas_exp_obj_create(struct cas_disk *dsk, const char *dev_name,
gd->fops = &_cas_exp_obj_ops; gd->fops = &_cas_exp_obj_ops;
gd->private_data = dsk; gd->private_data = dsk;
strlcpy(gd->disk_name, exp_obj->dev_name, sizeof(gd->disk_name)); strscpy(gd->disk_name, exp_obj->dev_name, sizeof(gd->disk_name));
cas_blk_queue_make_request(queue, _cas_exp_obj_make_rq_fn); cas_blk_queue_make_request(queue, _cas_exp_obj_make_rq_fn);

8
modules/cas_cache/layer_cache_management.c
View File

@ -2122,7 +2122,7 @@ static void cache_mngt_probe_metadata_end(void *priv, int error,
goto err; goto err;
} }
strlcpy(context->cache_name_meta, status->cache_name, strscpy(context->cache_name_meta, status->cache_name,
OCF_CACHE_NAME_SIZE); OCF_CACHE_NAME_SIZE);
*(context->cache_mode_meta) = status->cache_mode; *(context->cache_mode_meta) = status->cache_mode;
*(context->cache_line_size_meta) = status->cache_line_size; *(context->cache_line_size_meta) = status->cache_line_size;
@ -2487,7 +2487,7 @@ int cache_mngt_init_instance(struct ocf_mngt_cache_config *cfg,
} }
result = 0; result = 0;
strlcpy(cfg->name, cache_name_meta, OCF_CACHE_NAME_SIZE); strscpy(cfg->name, cache_name_meta, OCF_CACHE_NAME_SIZE);
cfg->cache_mode = cache_mode_meta; cfg->cache_mode = cache_mode_meta;
cfg->cache_line_size = cache_line_size_meta; cfg->cache_line_size = cache_line_size_meta;
default: default:
@ -3096,7 +3096,7 @@ int cache_mngt_get_info(struct kcas_cache_info *info)
if (info->info.attached && !info->info.standby_detached) { if (info->info.attached && !info->info.standby_detached) {
uuid = ocf_cache_get_uuid(cache); uuid = ocf_cache_get_uuid(cache);
BUG_ON(!uuid); BUG_ON(!uuid);
strlcpy(info->cache_path_name, uuid->data, strscpy(info->cache_path_name, uuid->data,
min(sizeof(info->cache_path_name), uuid->size)); min(sizeof(info->cache_path_name), uuid->size));
} else { } else {
memset(info->cache_path_name, 0, sizeof(info->cache_path_name)); memset(info->cache_path_name, 0, sizeof(info->cache_path_name));
@ -3176,7 +3176,7 @@ int cache_mngt_get_core_info(struct kcas_core_info *info)
uuid = ocf_core_get_uuid(core); uuid = ocf_core_get_uuid(core);
if (uuid->data) { if (uuid->data) {
strlcpy(info->core_path_name, uuid->data, strscpy(info->core_path_name, uuid->data,
min(sizeof(info->core_path_name), uuid->size)); min(sizeof(info->core_path_name), uuid->size));
} }

3
modules/cas_cache/ocf_env.h
View File

@ -1,5 +1,6 @@
/* /*
* Copyright(c) 2012-2022 Intel Corporation * Copyright(c) 2012-2022 Intel Corporation
* Copyright(c) 2024 Huawei Technologies
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -597,7 +598,7 @@ static inline int env_bit_test(int nr, const void *addr)
#define env_strncmp(s1, slen1, s2, slen2) strncmp(s1, s2, \ #define env_strncmp(s1, slen1, s2, slen2) strncmp(s1, s2, \
min_t(size_t, slen1, slen2)) min_t(size_t, slen1, slen2))
#define env_strncpy(dest, dmax, src, slen) ({ \ #define env_strncpy(dest, dmax, src, slen) ({ \
strlcpy(dest, src, min_t(int, dmax, slen)); \ strscpy(dest, src, min_t(int, dmax, slen)); \
0; \ 0; \
}) })