p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: qed: use correct strncpy() size 

passing the strlen() of the source string as the destination
length is pointless, and gcc-8 now warns about it:

drivers/net/ethernet/qlogic/qed/qed_debug.c: In function 'qed_grc_dump':
include/linux/string.h:253: error: 'strncpy' specified bound depends on the length of the source argument [-Werror=stringop-overflow=]

This changes qed_grc_dump_big_ram() to instead uses the length of
the destination buffer, and use strscpy() to guarantee nul-termination.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnd Bergmann 2018-02-02 16:44:47 +01:00 committed by David S. Miller
parent 1a91649fd3
commit 11f711081a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/qlogic/qed/qed_debug.c
View File

@ -3649,10 +3649,8 @@ static u32 qed_grc_dump_big_ram(struct qed_hwfn *p_hwfn,
BIT(big_ram->is_256b_bit_offset[dev_data->chip_id]) ? 256 BIT(big_ram->is_256b_bit_offset[dev_data->chip_id]) ? 256
: 128; : 128;
strncpy(type_name, big_ram->instance_name, strscpy(type_name, big_ram->instance_name, sizeof(type_name));
strlen(big_ram->instance_name)); strscpy(mem_name, big_ram->instance_name, sizeof(mem_name));
strncpy(mem_name, big_ram->instance_name,
strlen(big_ram->instance_name));
/* Dump memory header */ /* Dump memory header */
offset += qed_grc_dump_mem_hdr(p_hwfn, offset += qed_grc_dump_mem_hdr(p_hwfn,