aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-05-05 18:30:23 -0400
committerDavid S. Miller <davem@davemloft.net>2017-05-08 14:41:42 -0400
commit4dc69c1c1fff2f587f8e737e70b4a4e7565a5c94 (patch)
tree5c7d102ae1944478185b324c19127b778ecbe896
parent9e4eb1ce472fbf7b007f23c88ec11c37265e401c (diff)
bna: ethtool: Avoid reading past end of buffer
Using memcpy() from a string that is shorter than the length copied means the destination buffer is being filled with arbitrary data from the kernel rodata segment. Instead, use strncpy() which will fill the trailing bytes with zeros. This was found with the future CONFIG_FORTIFY_SOURCE feature. Cc: Daniel Micay <danielmicay@gmail.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/brocade/bna/bnad_ethtool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
index 286593922139..31032de5843b 100644
--- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
+++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c
@@ -547,8 +547,8 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)
547 for (i = 0; i < BNAD_ETHTOOL_STATS_NUM; i++) { 547 for (i = 0; i < BNAD_ETHTOOL_STATS_NUM; i++) {
548 BUG_ON(!(strlen(bnad_net_stats_strings[i]) < 548 BUG_ON(!(strlen(bnad_net_stats_strings[i]) <
549 ETH_GSTRING_LEN)); 549 ETH_GSTRING_LEN));
550 memcpy(string, bnad_net_stats_strings[i], 550 strncpy(string, bnad_net_stats_strings[i],
551 ETH_GSTRING_LEN); 551 ETH_GSTRING_LEN);
552 string += ETH_GSTRING_LEN; 552 string += ETH_GSTRING_LEN;
553 } 553 }
554 bmap = bna_tx_rid_mask(&bnad->bna); 554 bmap = bna_tx_rid_mask(&bnad->bna);