Skip to content

Commit 0fa68da

Browse files
Teng Qidavem330
authored andcommitted
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>
1 parent 61217be commit 0fa68da

File tree

1 file changed

+4
-0
lines changed
  • drivers/net/ethernet/dec/tulip

1 file changed

+4
-0
lines changed

drivers/net/ethernet/dec/tulip/de4x5.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4709,6 +4709,10 @@ type3_infoblock(struct net_device *dev, u_char count, u_char *p)
47094709
lp->ibn = 3;
47104710
lp->active = *p++;
47114711
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;
47124716
lp->phy[lp->active].gep = (*p ? p : NULL); p += (2 * (*p) + 1);
47134717
lp->phy[lp->active].rst = (*p ? p : NULL); p += (2 * (*p) + 1);
47144718
lp->phy[lp->active].mc = get_unaligned_le16(p); p += 2;

0 commit comments

Comments
 (0)