summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/qlogic
diff options
context:
space:
mode:
authorWang Xiayang <xywang.sjtu@sjtu.edu.cn>2019-07-31 11:15:42 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-08-29 09:26:40 +0300
commit77a6e51271f08e6b10426477afa3b4afa9bfa221 (patch)
tree4614f34b412737f94079d29d8182f37f6e28fef3 /drivers/net/ethernet/qlogic
parent4132b908c8fe5cbdac619911f116aec7e6fa1910 (diff)
downloadlinux-77a6e51271f08e6b10426477afa3b4afa9bfa221.tar.xz
net/ethernet/qlogic/qed: force the string buffer NULL-terminated
[ Upstream commit 3690c8c9a8edff0db077a38783112d8fe12a7dd2 ] strncpy() does not ensure NULL-termination when the input string size equals to the destination buffer size 30. The output string is passed to qed_int_deassertion_aeu_bit() which calls DP_INFO() and relies NULL-termination. Use strlcpy instead. The other conditional branch above strncpy() needs no fix as snprintf() ensures NULL-termination. This issue is identified by a Coccinelle script. Signed-off-by: Wang Xiayang <xywang.sjtu@sjtu.edu.cn> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r--drivers/net/ethernet/qlogic/qed/qed_int.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_int.c b/drivers/net/ethernet/qlogic/qed/qed_int.c
index 7746417130bd..c5d9f290ec4c 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_int.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_int.c
@@ -939,7 +939,7 @@ static int qed_int_deassertion(struct qed_hwfn *p_hwfn,
snprintf(bit_name, 30,
p_aeu->bit_name, num);
else
- strncpy(bit_name,
+ strlcpy(bit_name,
p_aeu->bit_name, 30);
/* We now need to pass bitmask in its