qed: Fix copying 2 strings
authorDenis Bolotin <denis.bolotin@cavium.com>
Tue, 24 Apr 2018 12:32:53 +0000 (15:32 +0300)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Apr 2018 17:59:42 +0000 (13:59 -0400)
The strscpy() was a recent fix (net: qed: use correct strncpy() size) to
prevent passing the length of the source buffer to strncpy() and guarantee
null termination.
It misses the goal of overwriting only the first 3 characters in
"???_BIG_RAM" and "???_RAM" while keeping the rest of the string.
Use strncpy() with the length of 3, without null termination.

Signed-off-by: Denis Bolotin <denis.bolotin@cavium.com>
Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qlogic/qed/qed_debug.c

index b3211c7..39124b5 100644 (file)
@@ -419,6 +419,7 @@ struct phy_defs {
 #define NUM_RSS_MEM_TYPES              5
 
 #define NUM_BIG_RAM_TYPES              3
+#define BIG_RAM_NAME_LEN               3
 
 #define NUM_PHY_TBUS_ADDRESSES         2048
 #define PHY_DUMP_SIZE_DWORDS           (NUM_PHY_TBUS_ADDRESSES / 2)
@@ -3650,8 +3651,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
                                                                         : 128;
 
-       strscpy(type_name, big_ram->instance_name, sizeof(type_name));
-       strscpy(mem_name, big_ram->instance_name, sizeof(mem_name));
+       strncpy(type_name, big_ram->instance_name, BIG_RAM_NAME_LEN);
+       strncpy(mem_name, big_ram->instance_name, BIG_RAM_NAME_LEN);
 
        /* Dump memory header */
        offset += qed_grc_dump_mem_hdr(p_hwfn,