Commit 2c0ab32b authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

hinic: Replace memcpy() with direct assignment 

Under CONFIG_FORTIFY_SOURCE=y and CONFIG_UBSAN_BOUNDS=y, Clang is bugged
here for calculating the size of the destination buffer (0x10 instead of
0x14). This copy is a fixed size (sizeof(struct fw_section_info_st)), with
the source and dest being struct fw_section_info_st, so the memcpy should
be safe, assuming the index is within bounds, which is UBSAN_BOUNDS's
responsibility to figure out.

Avoid the whole thing and just do a direct assignment. This results in
no change to the executable code.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Tom Rix <trix@redhat.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Jiri Pirko <jiri@nvidia.com>
Cc: Vladimir Oltean <olteanv@gmail.com>
Cc: Simon Horman <simon.horman@corigine.com>
Cc: netdev@vger.kernel.org
Cc: llvm@lists.linux.dev
Link: https://github.com/ClangBuiltLinux/linux/issues/1592


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Tested-by: Nathan Chancellor <nathan@kernel.org> # build
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 225b0ed2

drivers/net/ethernet/huawei/hinic/hinic_devlink.c

+1 −3
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ static bool check_image_valid(struct hinic_devlink_priv *priv, const u8 *buf, 


	for (i = 0; i < fw_image->fw_info.fw_section_cnt; i++) {

		len += fw_image->fw_section_info[i].fw_section_len;

		memcpy(&host_image->image_section_info[i],

		       &fw_image->fw_section_info[i],

		       sizeof(struct fw_section_info_st));

		host_image->image_section_info[i] = fw_image->fw_section_info[i];

	}



	if (len != fw_image->fw_len ||