leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bna: ethtool: Avoid reading past end of buffer

Browse Source 
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>
This commit is contained in:
Kees Cook 2017-05-05 15:30:23 -07:00 committed by David S. Miller
parent 9e4eb1ce47
commit 4dc69c1c1f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/brocade/bna/bnad_ethtool.c
View File

@ -547,8 +547,8 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string)
for (i = 0; i < BNAD_ETHTOOL_STATS_NUM; i++) { for (i = 0; i < BNAD_ETHTOOL_STATS_NUM; i++) {
BUG_ON(!(strlen(bnad_net_stats_strings[i]) < BUG_ON(!(strlen(bnad_net_stats_strings[i]) <
ETH_GSTRING_LEN)); ETH_GSTRING_LEN));
memcpy(string, bnad_net_stats_strings[i], strncpy(string, bnad_net_stats_strings[i],
ETH_GSTRING_LEN); ETH_GSTRING_LEN);
string += ETH_GSTRING_LEN; string += ETH_GSTRING_LEN;
} }
bmap = bna_tx_rid_mask(&bnad->bna); bmap = bna_tx_rid_mask(&bnad->bna);