Patch "hinic: Replace memcpy() with direct assignment" has been added to the 5.18-stable tree
Subsystems (2)
[email protected]
AppliedThis is a note to let you know that I've just added the patch titled
hinic: Replace memcpy() with direct assignment
to the 5.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
hinic-replace-memcpy-with-direct-assignment.patch
and it can be found in the queue-5.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From 1e70212e031528918066a631c9fdccda93a1ffaa Mon Sep 17 00:00:00 2001
From: Kees Cook <[email protected]>
Date: Wed, 15 Jun 2022 22:23:12 -0700
Subject: hinic: Replace memcpy() with direct assignment
From: Kees Cook <[email protected]>
commit 1e70212e031528918066a631c9fdccda93a1ffaa upstream.
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.
[This is a duplicate of commit 2c0ab32b73cf ("hinic: Replace memcpy()
with direct assignment") which was applied to net-next.]
--- drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_devlink.c +1 -3
@@ -43,9 +43,7 @@ static bool check_image_valid(struct hinfor (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 ||
Patches currently in stable-queue which might be from [email protected] are
queue-5.18/hinic-replace-memcpy-with-direct-assignment.patch