Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: scsi_transport_fc: Adjust struct fc_nl_event flex array usage

In order to help the compiler reason about the destination buffer in struct
fc_nl_event, add a flexible array member for this purpose. However, since
the header is UAPI, it must not change size or layout, so a union is used.

The allocation size calculations are also corrected (it was potentially
allocating an extra 8 bytes), and the padding is zeroed to avoid leaking
kernel heap memory contents.

Detected at run-time by the recently added memcpy() bounds checking:

memcpy: detected field-spanning write (size 8) of single field "&event->event_data" at drivers/scsi/scsi_transport_fc.c:581 (size 4)

Link: https://lore.kernel.org/linux-next/42404B5E-198B-4FD3-94D6-5E16CF579EF3@linux.ibm.com/
Link: https://lore.kernel.org/r/20220921205155.1451649-1-keescook@chromium.org
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Reported-by: Sachin Sant <sachinp@linux.ibm.com>
Tested-by: Sachin Sant <sachinp@linux.ibm.com>
Reviewed-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Kees Cook and committed by
Martin K. Petersen
d88a0240 1a2433b0

+10 -5
+5 -3
drivers/scsi/scsi_transport_fc.c
··· 543 543 struct nlmsghdr *nlh; 544 544 struct fc_nl_event *event; 545 545 const char *name; 546 - u32 len; 546 + size_t len, padding; 547 547 int err; 548 548 549 549 if (!data_buf || data_len < 4) ··· 554 554 goto send_fail; 555 555 } 556 556 557 - len = FC_NL_MSGALIGN(sizeof(*event) + data_len); 557 + len = FC_NL_MSGALIGN(sizeof(*event) - sizeof(event->event_data) + data_len); 558 558 559 559 skb = nlmsg_new(len, GFP_KERNEL); 560 560 if (!skb) { ··· 578 578 event->event_num = event_number; 579 579 event->event_code = event_code; 580 580 if (data_len) 581 - memcpy(&event->event_data, data_buf, data_len); 581 + memcpy(event->event_data_flex, data_buf, data_len); 582 + padding = len - offsetof(typeof(*event), event_data_flex) - data_len; 583 + memset(event->event_data_flex + data_len, 0, padding); 582 584 583 585 nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, 584 586 GFP_KERNEL);