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

NFC: hci: Split memcpy() of struct hcp_message flexible 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
split already existed for the "firstfrag" case, so just generalize the
logic further.

[1] https://lore.kernel.org/linux-hardening/20220901065914.1417829-2-keescook@chromium.org/

Cc: Eric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Reported-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220924040835.3364912-1-keescook@chromium.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Kees Cook and committed by
Jakub Kicinski
de4feb4e 454b20e1

+5 -7
+5 -7
net/nfc/hci/hcp.c
··· 73 73 if (firstfrag) { 74 74 firstfrag = false; 75 75 packet->message.header = HCP_HEADER(type, instruction); 76 - if (ptr) { 77 - memcpy(packet->message.data, ptr, 78 - data_link_len - 1); 79 - ptr += data_link_len - 1; 80 - } 81 76 } else { 82 - memcpy(&packet->message, ptr, data_link_len); 83 - ptr += data_link_len; 77 + packet->message.header = *ptr++; 78 + } 79 + if (ptr) { 80 + memcpy(packet->message.data, ptr, data_link_len - 1); 81 + ptr += data_link_len - 1; 84 82 } 85 83 86 84 /* This is the last fragment, set the cb bit */