Skip to content

Commit fb2d14a

Browse files
keesliuw
authored andcommitted
Drivers: hv: vmbus: Split memcpy of flex-array
To work around a misbehavior of the compiler's ability to see into composite flexible array structs (as detailed in the coming memcpy() hardening series[1]), split the memcpy() of the header and the payload so no false positive run-time overflow warning will be generated. This results in the already inlined memcpy getting unrolled a little more, which very slightly increases text size: $ size drivers/hv/vmbus_drv.o.before drivers/hv/vmbus_drv.o text data bss dec hex filename 22968 5239 232 28439 6f17 drivers/hv/vmbus_drv.o.before 23032 5239 232 28503 6f57 drivers/hv/vmbus_drv.o Avoids the run-time false-positive warning: memcpy: detected field-spanning write (size 212) of single field "&ctx->msg" at drivers/hv/vmbus_drv.c:1133 (size 16) [1] https://lore.kernel.org/linux-hardening/[email protected]/ Cc: "K. Y. Srinivasan" <[email protected]> Cc: Haiyang Zhang <[email protected]> Cc: Stephen Hemminger <[email protected]> Cc: Wei Liu <[email protected]> Cc: Dexuan Cui <[email protected]> Cc: [email protected] Reported-by: Nathan Chancellor <[email protected]> Reported-by: "Gustavo A. R. Silva" <[email protected]> Tested-by: Nathan Chancellor <[email protected]> Signed-off-by: Kees Cook <[email protected]> Reviewed-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Michael Kelley <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Wei Liu <[email protected]>
1 parent 635b241 commit fb2d14a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/hv/vmbus_drv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,8 @@ void vmbus_on_msg_dpc(unsigned long data)
11301130
return;
11311131

11321132
INIT_WORK(&ctx->work, vmbus_onmessage_work);
1133-
memcpy(&ctx->msg, &msg_copy, sizeof(msg->header) + payload_size);
1133+
ctx->msg.header = msg_copy.header;
1134+
memcpy(&ctx->msg.payload, msg_copy.u.payload, payload_size);
11341135

11351136
/*
11361137
* The host can generate a rescind message while we

0 commit comments

Comments
 (0)