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

net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock()

The definition of macro MOTO_SROM_BUG is:
#define MOTO_SROM_BUG (lp->active == 8 && (get_unaligned_le32(
dev->dev_addr) & 0x00ffffff) == 0x3e0008)

and the if statement
if (MOTO_SROM_BUG) lp->active = 0;

using this macro indicates lp->active could be 8. If lp->active is 8 and
the second comparison of this macro is false. lp->active will remain 8 in:
lp->phy[lp->active].gep = (*p ? p : NULL); p += (2 * (*p) + 1);
lp->phy[lp->active].rst = (*p ? p : NULL); p += (2 * (*p) + 1);
lp->phy[lp->active].mc = get_unaligned_le16(p); p += 2;
lp->phy[lp->active].ana = get_unaligned_le16(p); p += 2;
lp->phy[lp->active].fdx = get_unaligned_le16(p); p += 2;
lp->phy[lp->active].ttm = get_unaligned_le16(p); p += 2;
lp->phy[lp->active].mci = *p;

However, the length of array lp->phy is 8, so array overflows can occur.
To fix these possible array overflows, we first check lp->active and then
return -EINVAL if it is greater or equal to ARRAY_SIZE(lp->phy) (i.e. 8).

Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
Signed-off-by: Teng Qi <starmiku1207184332@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Teng Qi and committed by
David S. Miller
0fa68da7 61217be8

+4
+4
drivers/net/ethernet/dec/tulip/de4x5.c
··· 4709 4709 lp->ibn = 3; 4710 4710 lp->active = *p++; 4711 4711 if (MOTO_SROM_BUG) lp->active = 0; 4712 + /* if (MOTO_SROM_BUG) statement indicates lp->active could 4713 + * be 8 (i.e. the size of array lp->phy) */ 4714 + if (WARN_ON(lp->active >= ARRAY_SIZE(lp->phy))) 4715 + return -EINVAL; 4712 4716 lp->phy[lp->active].gep = (*p ? p : NULL); p += (2 * (*p) + 1); 4713 4717 lp->phy[lp->active].rst = (*p ? p : NULL); p += (2 * (*p) + 1); 4714 4718 lp->phy[lp->active].mc = get_unaligned_le16(p); p += 2;