net: stmmac: dwmac-rk: fix oob read in rk_gmac_setup
authorJohn Keeping <john@metanate.com>
Tue, 14 Dec 2021 19:10:09 +0000 (19:10 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Dec 2021 08:32:44 +0000 (09:32 +0100)
commit0b4a5d1e15ce72f69be48f38dc0401dab890ae0f
tree030a58fa575bfb395636af9a52a99f6161cd5091
parentfeb116a0ecc5625d6532c616d9a10ef4ef81514b
net: stmmac: dwmac-rk: fix oob read in rk_gmac_setup

[ Upstream commit 0546b224cc7717cc8a2db076b0bb069a9c430794 ]

KASAN reports an out-of-bounds read in rk_gmac_setup on the line:

while (ops->regs[i]) {

This happens for most platforms since the regs flexible array member is
empty, so the memory after the ops structure is being read here.  It
seems that mostly this happens to contain zero anyway, so we get lucky
and everything still works.

To avoid adding redundant data to nearly all the ops structures, add a
new flag to indicate whether the regs field is valid and avoid this loop
when it is not.

Fixes: 3bb3d6b1c195 ("net: stmmac: Add RK3566/RK3568 SoC support")
Signed-off-by: John Keeping <john@metanate.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c