Skip to content

Commit c042353

Browse files
JustinStittkuba-moo
authored andcommitted
cavium/liquidio: replace deprecated strncpy with strscpy
`strncpy` is deprecated for use on NUL-terminated destination strings [1] and as such we should prefer more robust and less ambiguous string interfaces. We expect `app_name` to be NUL-terminated: dev_info(&oct->pci_dev->dev, "Running %s (%llu Hz)\n", app_name, CVM_CAST64(cs->corefreq)); ... and it seems NUL-padding is not required, let's opt for strscpy(). For `oct->boardinfo.name/serial_number` let's opt for strscpy() as well since it is expected to be NUL-terminated and does not require NUL-padding as `oct` is zero-initialized in octeon_device.c +707: | buf = vzalloc(size); | if (!buf) | return NULL; | | oct = (struct octeon_device *)buf; Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1] Link: KSPP/linux#90 Signed-off-by: Justin Stitt <justinstitt@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/20231005-strncpy-drivers-net-ethernet-cavium-liquidio-octeon_device-c-v1-1-9a207cef9438@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent a167242 commit c042353

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

drivers/net/ethernet/cavium/liquidio/octeon_device.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,10 +1217,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf)
12171217
goto core_drv_init_err;
12181218
}
12191219

1220-
strncpy(app_name,
1220+
strscpy(app_name,
12211221
get_oct_app_string(
12221222
(u32)recv_pkt->rh.r_core_drv_init.app_mode),
1223-
sizeof(app_name) - 1);
1223+
sizeof(app_name));
12241224
oct->app_mode = (u32)recv_pkt->rh.r_core_drv_init.app_mode;
12251225
if (recv_pkt->rh.r_core_drv_init.app_mode == CVM_DRV_NIC_APP) {
12261226
oct->fw_info.max_nic_ports =
@@ -1257,9 +1257,10 @@ int octeon_core_drv_init(struct octeon_recv_info *recv_info, void *buf)
12571257
memcpy(cs, get_rbd(
12581258
recv_pkt->buffer_ptr[0]) + OCT_DROQ_INFO_SIZE, sizeof(*cs));
12591259

1260-
strncpy(oct->boardinfo.name, cs->boardname, OCT_BOARD_NAME);
1261-
strncpy(oct->boardinfo.serial_number, cs->board_serial_number,
1262-
OCT_SERIAL_LEN);
1260+
strscpy(oct->boardinfo.name, cs->boardname,
1261+
sizeof(oct->boardinfo.name));
1262+
strscpy(oct->boardinfo.serial_number, cs->board_serial_number,
1263+
sizeof(oct->boardinfo.serial_number));
12631264

12641265
octeon_swap_8B_data((u64 *)cs, (sizeof(*cs) >> 3));
12651266

0 commit comments

Comments
 (0)