Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f828fb authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

bna: Avoid reading past end of buffer 




[ Upstream commit 9e4eb1ce472fbf7b007f23c88ec11c37265e401c ]

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3b0df34

drivers/net/ethernet/brocade/bna/bfa_ioc.c

+1 −1
Original line number Diff line number Diff line
@@ -2856,7 +2856,7 @@ bfa_ioc_get_adapter_optrom_ver(struct bfa_ioc *ioc, char *optrom_ver) 
static void

bfa_ioc_get_adapter_manufacturer(struct bfa_ioc *ioc, char *manufacturer)

{

	memcpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN);

	strncpy(manufacturer, BFA_MFG_NAME, BFA_ADAPTER_MFG_NAME_LEN);

}



static void