ath11k: Avoid memcpy() over-reading of he_cap
authorKees Cook <keescook@chromium.org>
Wed, 16 Jun 2021 19:54:10 +0000 (12:54 -0700)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 22 Jun 2021 15:28:00 +0000 (18:28 +0300)
commitc8bcd82a4efd053cdd5ce515a8b0003011a5f756
tree4fce0eb4a4ec04487e6c8f5fa4c36a2fb019fd88
parent49f5b114e36ebc69318ab95f98b57df7458b0f42
ath11k: Avoid memcpy() over-reading of he_cap

In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally writing across neighboring array fields.

Since peer_he_cap_{mac,phy}info and he_cap_elem.{mac,phy}_cap_info are not
the same sizes, memcpy() was reading beyond field boundaries. Instead,
correctly cap the copy length and pad out any difference in size
(peer_he_cap_macinfo is 8 bytes whereas mac_cap_info is 6, and
peer_he_cap_phyinfo is 12 bytes whereas phy_cap_info is 11).

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210616195410.1232119-1-keescook@chromium.org
drivers/net/wireless/ath/ath11k/mac.c