Commit c7d852e3 authored by Denis Bolotin's avatar Denis Bolotin Committed by David S. Miller

qed: Fix copying 2 strings

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: default avatarDenis Bolotin <denis.bolotin@cavium.com>
Signed-off-by: default avatarAriel Elior <ariel.elior@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc0fbc66
...@@ -419,6 +419,7 @@ struct phy_defs { ...@@ -419,6 +419,7 @@ struct phy_defs {
#define NUM_RSS_MEM_TYPES 5 #define NUM_RSS_MEM_TYPES 5
#define NUM_BIG_RAM_TYPES 3 #define NUM_BIG_RAM_TYPES 3
#define BIG_RAM_NAME_LEN 3
#define NUM_PHY_TBUS_ADDRESSES 2048 #define NUM_PHY_TBUS_ADDRESSES 2048
#define PHY_DUMP_SIZE_DWORDS (NUM_PHY_TBUS_ADDRESSES / 2) #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, ...@@ -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 BIT(big_ram->is_256b_bit_offset[dev_data->chip_id]) ? 256
: 128; : 128;
strscpy(type_name, big_ram->instance_name, sizeof(type_name)); strncpy(type_name, big_ram->instance_name, BIG_RAM_NAME_LEN);
strscpy(mem_name, big_ram->instance_name, sizeof(mem_name)); strncpy(mem_name, big_ram->instance_name, BIG_RAM_NAME_LEN);
/* Dump memory header */ /* Dump memory header */
offset += qed_grc_dump_mem_hdr(p_hwfn, offset += qed_grc_dump_mem_hdr(p_hwfn,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment