Skip to content

Commit 6d8c8fd

Browse files
arndbgregkh
authored andcommitted
qlge: avoid memcpy buffer overflow
[ Upstream commit e58f95831e7468d25eb6e41f234842ecfe6f014f ] gcc-8.0.0 (snapshot) points out that we copy a variable-length string into a fixed length field using memcpy() with the destination length, and that ends up copying whatever follows the string: inlined from 'ql_core_dump' at drivers/net/ethernet/qlogic/qlge/qlge_dbg.c:1106:2: drivers/net/ethernet/qlogic/qlge/qlge_dbg.c:708:2: error: 'memcpy' reading 15 bytes from a region of size 14 [-Werror=stringop-overflow=] memcpy(seg_hdr->description, desc, (sizeof(seg_hdr->description)) - 1); Changing it to use strncpy() will instead zero-pad the destination, which seems to be the right thing to do here. The bug is probably harmless, but it seems like a good idea to address it in stable kernels as well, if only for the purpose of building with gcc-8 without warnings. Fixes: a61f802 ("qlge: Add ethtool register dump function.") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 354d36b commit 6d8c8fd

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/net/ethernet/qlogic/qlge/qlge_dbg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ static void ql_build_coredump_seg_header(
724724
seg_hdr->cookie = MPI_COREDUMP_COOKIE;
725725
seg_hdr->segNum = seg_number;
726726
seg_hdr->segSize = seg_size;
727-
memcpy(seg_hdr->description, desc, (sizeof(seg_hdr->description)) - 1);
727+
strncpy(seg_hdr->description, desc, (sizeof(seg_hdr->description)) - 1);
728728
}
729729

730730
/*

0 commit comments

Comments
 (0)