Skip to content

Replace strncpy with memcpy #9835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hyunjiki-amd wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Replace strncpy with memcpy #9835

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eae123d
Replace strncpy with memcpy - part 1
hyunjiki-amd May 25, 2026
0c5961f
Replace strncpy with memcpy - part 2
hyunjiki-amd May 25, 2026
239bcef
Use std::min instead of if conditions if .cpp
hyunjiki-amd May 27, 2026
f608baf
Replace if patterns with the conditional operator pattern
hyunjiki-amd May 27, 2026
fa627f0
Use std::min instead of if conditions in shim.cpp
hyunjiki-amd May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions src/runtime_src/core/common/drv/kds_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,13 +1951,23 @@ int kds_ip_layout2cu_info(struct ip_layout *ip_layout,
/* ip_data->m_name format "<kernel name>:<instance name>",
* where instance name is so called CU name.
*/
strncpy(kname, ip->m_name, sizeof(kname));
kname[sizeof(kname)-1] = '\0';
size_t len = strlen(ip->m_name);
if (len >= sizeof(kname)) {
len = sizeof(kname) - 1;
}
memcpy(kname, ip->m_name, len);
kname[len] = '\0';
kname_p = &kname[0];
strncpy(info.kname, strsep(&kname_p, ":"), sizeof(info.kname));
info.kname[sizeof(info.kname)-1] = '\0';
strncpy(info.iname, strsep(&kname_p, ":"), sizeof(info.iname));
info.iname[sizeof(info.kname)-1] = '\0';
char *str1 = strsep(&kname_p, ":");
len = strlen(str1);
if (len >= sizeof(info.kname)) len = sizeof(info.kname) - 1;
memcpy(info.kname, str1, len);
info.kname[len] = '\0';
char *str2 = strsep(&kname_p, ":");
len = strlen(str2);
if (len >= sizeof(info.iname)) len = sizeof(info.iname) - 1;
memcpy(info.iname, str2, len);
info.iname[len] = '\0';

info.addr = ip->m_base_address;
info.intr_enable = ip->properties & IP_INT_ENABLE_MASK;
Expand Down Expand Up @@ -2050,13 +2060,24 @@ int kds_ip_layout2scu_info(struct ip_layout *ip_layout, struct xrt_cu_info cu_in
/* ip_data->m_name format "<kernel name>:<instance name>",
* where instance name is so called CU name.
*/
strncpy(kname, ip->m_name, sizeof(kname));
kname[sizeof(kname)-1] = '\0';
size_t len = strlen(ip->m_name);
if (len >= sizeof(kname))
len = sizeof(kname) - 1;
memcpy(kname, ip->m_name, len);
kname[len] = '\0';
kname_p = &kname[0];
strncpy(info.kname, strsep(&kname_p, ":"), sizeof(info.kname));
info.kname[sizeof(info.kname)-1] = '\0';
strncpy(info.iname, strsep(&kname_p, ":"), sizeof(info.iname));
info.iname[sizeof(info.kname)-1] = '\0';
char *str1 = strsep(&kname_p, ":");
len = strlen(str1);
if (len >= sizeof(info.kname))
len = sizeof(info.kname) - 1;
memcpy(info.kname, str1, len);
info.kname[len] = '\0';
char *str2 = strsep(&kname_p, ":");
len = strlen(str2);
if (len >= sizeof(info.iname))
len = sizeof(info.iname) - 1;
memcpy(info.iname, str2, len);
info.iname[len] = '\0';

info.addr = 0;
info.intr_enable = 0;
Expand Down
6 changes: 5 additions & 1 deletion src/runtime_src/core/edge/common_em/unix_socket.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ void unix_socket::start_server(const std::string sk_desc)
}
server.sun_family = AF_UNIX;
//Coverity
strncpy(server.sun_path, sk_desc.c_str(),STR_MAX_LEN);
size_t len = sk_desc.length();
if (len >= sizeof(server.sun_path))
len = sizeof(server.sun_path) - 1;
memcpy(server.sun_path, sk_desc.c_str(), len);
server.sun_path[len] = '\0';
if (connect(sock, (struct sockaddr*)&server, sizeof(server)) >= 0){
fd = sock;
server_started = true;
Expand Down
19 changes: 13 additions & 6 deletions src/runtime_src/core/edge/drm/zocl/common/zocl_xclbin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,19 @@ zocl_update_apertures(struct drm_zocl_dev *zdev, struct drm_zocl_slot *slot)
apt = &zdev->cu_subdev.apertures[apt_idx];

apt->addr = ip->m_base_address;

strncpy(kname, ip->m_name, sizeof(kname));
kname[sizeof(kname)-1] = '\0';
kname_p = &kname[0];
strncpy(kname, strsep(&kname_p, ":"), sizeof(kname));
kname[sizeof(kname)-1] = '\0';

size_t len = strlen(ip->m_name);
if (len >= sizeof(kname))
len = sizeof(kname) - 1;
memcpy(kname, ip->m_name, len);
kname[len] = '\0';
kname_p = &kname[0];
char *str = strsep(&kname_p, ":");
len = strlen(str);
if (len >= sizeof(kname))
len = sizeof(kname) - 1;
memcpy(kname, str, len);
kname[len] = '\0';
krnl_info = zocl_query_kernel(slot, kname);
if (krnl_info && krnl_info->range >= CU_SIZE)
apt->size = krnl_info->range;
Expand Down
6 changes: 5 additions & 1 deletion src/runtime_src/core/edge/drm/zocl/zert/scu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,11 @@ static int configure_soft_kernel(u32 cuidx, char kname[64], unsigned char uuid[1
cp = kmalloc(sizeof(struct config_sk_image_uuid), GFP_KERNEL);
cp->start_cuidx = cuidx;
cp->num_cus = 1;
strncpy((char *)cp->sk_name,kname, PS_KERNEL_NAME_LENGTH);
size_t len = strlen(kname);
if (len >= PS_KERNEL_NAME_LENGTH)
len = PS_KERNEL_NAME_LENGTH - 1;
memcpy((char *)cp->sk_name, kname, len);
cp->sk_name[len] = '\0';
memcpy(cp->sk_uuid, uuid, sizeof(cp->sk_uuid));

sk = zdev->soft_kernel;
Expand Down
8 changes: 5 additions & 3 deletions src/runtime_src/core/edge/drm/zocl/zert/zocl_ps_xclbin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,11 @@ zocl_load_pskernel(struct drm_zocl_dev *zdev, struct axlf *axlf, u32 slot_idx)
memcpy(sip->si_bo->cma_base.vaddr, begin + sp->m_image_offset,
sp->m_image_size);

strncpy(sip->scu_name,
begin + sp->mpo_symbol_name,
PS_KERNEL_NAME_LENGTH - 1);
size_t len = strlen(begin + sp->mpo_symbol_name);
if (len >= PS_KERNEL_NAME_LENGTH)
len = PS_KERNEL_NAME_LENGTH - 1;
memcpy(sip->scu_name, begin + sp->mpo_symbol_name, len);
sip->scu_name[len] = '\0';
scu_idx += sp->m_num_instances;

header = xrt_xclbin_get_section_hdr_next(axlf, SOFT_KERNEL,
Expand Down
47 changes: 35 additions & 12 deletions src/runtime_src/core/edge/user/shim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,11 @@ xclLoadAxlf(const axlf *buffer)
auto krnl = reinterpret_cast<kernel_info *>(axlf_obj.za_kernels + off);
if (kernel.name.size() > sizeof(krnl->name))
return -EINVAL;
std::strncpy(krnl->name, kernel.name.c_str(), sizeof(krnl->name)-1);
krnl->name[sizeof(krnl->name)-1] = '\0';
size_t len = kernel.name.length();
if (len >= sizeof(krnl->name))
len = sizeof(krnl->name) - 1;
std::memcpy(krnl->name, kernel.name.c_str(), len);
krnl->name[len] = '\0';
krnl->range = kernel.range;
krnl->anums = kernel.args.size();
krnl->features = 0;
Expand All @@ -773,8 +776,11 @@ xclLoadAxlf(const axlf *buffer)
xclLog(XRT_ERROR, "%s: Argument name length %d>%d", __func__, arg.name.size(), sizeof(krnl->args[ai].name));
return -EINVAL;
}
std::strncpy(krnl->args[ai].name, arg.name.c_str(), sizeof(krnl->args[ai].name)-1);
krnl->args[ai].name[sizeof(krnl->args[ai].name)-1] = '\0';
size_t arg_len = arg.name.length();
if (arg_len >= sizeof(krnl->args[ai].name))
arg_len = sizeof(krnl->args[ai].name) - 1;
std::memcpy(krnl->args[ai].name, arg.name.c_str(), arg_len);
krnl->args[ai].name[arg_len] = '\0';
krnl->args[ai].offset = arg.offset;
krnl->args[ai].size = arg.size;
// XCLBIN doesn't define argument direction yet and it only support
Expand Down Expand Up @@ -942,7 +948,11 @@ xclGetDebugIPlayoutPath(char* layoutPath, size_t size)
std::string path = xclGetSysfsPath("debug_ip_layout");
if (path.size() >= size)
return -EINVAL;
std::strncpy(layoutPath, path.c_str(), size);
size_t len = path.length();
if (len >= size)
len = size - 1;
std::memcpy(layoutPath, path.c_str(), len);
layoutPath[len] = '\0';
return 0;
}

Expand Down Expand Up @@ -1142,8 +1152,11 @@ open_cu_context(const xrt_core::hwctx_handle* hwctx_hdl, const std::string& cuna
drm_zocl_open_cu_ctx cu_ctx = {};
cu_ctx.flags = flags;
cu_ctx.hw_context = hwctx_hdl->get_slotidx();
std::strncpy(cu_ctx.cu_name, cuname.c_str(), sizeof(cu_ctx.cu_name));
cu_ctx.cu_name[sizeof(cu_ctx.cu_name) - 1] = 0;
size_t cu_len = cuname.length();
if (cu_len >= sizeof(cu_ctx.cu_name))
cu_len = sizeof(cu_ctx.cu_name) - 1;
std::memcpy(cu_ctx.cu_name, cuname.c_str(), cu_len);
cu_ctx.cu_name[cu_len] = '\0';
if (ioctl(mKernelFD, DRM_IOCTL_ZOCL_OPEN_CU_CTX, &cu_ctx))
throw xrt_core::system_error(errno, "Failed to open cu context");

Expand Down Expand Up @@ -1255,8 +1268,11 @@ int shim::prepare_hw_axlf(const axlf *buffer, struct drm_zocl_axlf *axlf_obj,
auto krnl = reinterpret_cast<kernel_info *>(axlf_obj->za_kernels + off);
if (kernel.name.size() > sizeof(krnl->name))
return -EINVAL;
std::strncpy(krnl->name, kernel.name.c_str(), sizeof(krnl->name)-1);
krnl->name[sizeof(krnl->name)-1] = '\0';
size_t krnl_len = kernel.name.length();
if (krnl_len >= sizeof(krnl->name))
krnl_len = sizeof(krnl->name) - 1;
std::memcpy(krnl->name, kernel.name.c_str(), krnl_len);
krnl->name[krnl_len] = '\0';
krnl->range = kernel.range;
krnl->anums = kernel.args.size();

Expand All @@ -1270,8 +1286,11 @@ int shim::prepare_hw_axlf(const axlf *buffer, struct drm_zocl_axlf *axlf_obj,
xclLog(XRT_ERROR, "%s: Argument name length %d>%d", __func__, arg.name.size(), sizeof(krnl->args[ai].name));
return -EINVAL;
}
std::strncpy(krnl->args[ai].name, arg.name.c_str(), sizeof(krnl->args[ai].name)-1);
krnl->args[ai].name[sizeof(krnl->args[ai].name)-1] = '\0';
size_t krnl_arg_len = arg.name.length();
if (krnl_arg_len >= sizeof(krnl->args[ai].name))
krnl_arg_len = sizeof(krnl->args[ai].name) - 1;
std::memcpy(krnl->args[ai].name, arg.name.c_str(), krnl_arg_len);
krnl->args[ai].name[krnl_arg_len] = '\0';
krnl->args[ai].offset = arg.offset;
krnl->args[ai].size = arg.size;
// XCLBIN doesn't define argument direction yet and it only support
Expand Down Expand Up @@ -2691,7 +2710,11 @@ xclGetSysfsPath(xclDeviceHandle handle, const char* subdev,
if (path.size() >= size)
return -EINVAL;

std::strncpy(sysfsPath, path.c_str(), size);
size_t sysfs_len = path.length();
if (sysfs_len >= size)
sysfs_len = size - 1;
std::memcpy(sysfsPath, path.c_str(), sysfs_len);
sysfsPath[sysfs_len] = '\0';
return 0;
}

Expand Down
14 changes: 10 additions & 4 deletions src/runtime_src/core/pcie/windows/alveo/shim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,8 +721,11 @@ struct shim

if (kernel.name.size() > sizeof(krnl->name))
return 1;
std::strncpy(krnl->name, kernel.name.c_str(), sizeof(krnl->name)-1);
krnl->name[sizeof(krnl->name)-1] = '\0';
size_t len = kernel.name.length();
if (len >= sizeof(krnl->name))
len = sizeof(krnl->name) - 1;
std::memcpy(krnl->name, kernel.name.c_str(), len);
krnl->name[len] = '\0';
krnl->anums = kernel.args.size();
krnl->range = kernel.range;

Expand All @@ -734,8 +737,11 @@ struct shim
send(xrt_core::message::severity_level::error, "XRT", "Argument name length invalid.");
return 1;
}
std::strncpy(krnl->args[ai].name, arg.name.c_str(), sizeof(krnl->args[ai].name)-1);
krnl->args[ai].name[sizeof(krnl->args[ai].name)-1] = '\0';
size_t arg_len = arg.name.length();
if (arg_len >= sizeof(krnl->args[ai].name))
arg_len = sizeof(krnl->args[ai].name) - 1;
std::memcpy(krnl->args[ai].name, arg.name.c_str(), arg_len);
krnl->args[ai].name[arg_len] = '\0';
krnl->args[ai].offset = arg.offset;
krnl->args[ai].size = arg.size;
// XCLBIN doesn't define argument direction yet and it only support
Expand Down
12 changes: 5 additions & 7 deletions src/runtime_src/hip/api/hip_device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@
#include <mutex>
#include <string>

#ifdef _WIN32
// to disable the compiler worning C4996: 'strncpy': This function or variable may be unsafe
# pragma warning( disable : 4996)
#endif

// forward declaration
namespace xrt::core::hip {
// Defined first so it is initialized before the global x below (same
Expand Down Expand Up @@ -134,8 +129,11 @@ hip_get_device_properties(hipDeviceProp_t* props, hipDevice_t device)
// Query device name using rom_vbnv
// Copy device name to device_props.name, ensuring no buffer overflow
auto name_str = (xrt_core::device_query<xrt_core::query::rom_vbnv>(device_handle));
std::strncpy(device_props.name, name_str.c_str(), sizeof(device_props.name) - 1);
device_props.name[sizeof(device_props.name) - 1] = '\0';
size_t len = name_str.length();
if (len >= sizeof(device_props.name))
len = sizeof(device_props.name) - 1;
std::memcpy(device_props.name, name_str.c_str(), len);
device_props.name[len] = '\0';
Copy link
Copy Markdown
Collaborator

@stsoe stsoe May 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
size_t len = name_str.length();
if (len >= sizeof(device_props.name))
len = sizeof(device_props.name) - 1;
std::memcpy(device_props.name, name_str.c_str(), len);
device_props.name[len] = '\0';
auto len = std::min(name_str.size(), sizeof(device_props.name) - 1);
std::memcpy(device_props.name, name_str.data(), len);
device_props.name[len] = '\0';

Copy link
Copy Markdown
Collaborator

@stsoe stsoe May 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not forget to sign all commits. git commit -s ...

// Extract and assign PCI domain, bus, and device IDs from the queried PCIe BDF tuple
device_props.pciDomainID = std::get<0>(uuid);
device_props.pciBusID = std::get<1>(uuid);
Expand Down
Loading