Skip to content

Commit 248be83

Browse files
Sergei Shtylyovdavem330
authored andcommitted
sh_eth: fix kernel oops in skb_put()
In a low memory situation the following kernel oops occurs: Unable to handle kernel NULL pointer dereference at virtual address 00000050 pgd = 8490c000 [00000050] *pgd=4651e831, *pte=00000000, *ppte=00000000 Internal error: Oops: 17 [#1] PREEMPT ARM Modules linked in: CPU: 0 Not tainted (3.4-at16 #9) PC is at skb_put+0x10/0x98 LR is at sh_eth_poll+0x2c8/0xa10 pc : [<8035f780>] lr : [<8028bf50>] psr: 60000113 sp : 84eb1a90 ip : 84eb1ac8 fp : 84eb1ac4 r10: 0000003f r9 : 000005ea r8 : 00000000 r7 : 00000000 r6 : 940453b0 r5 : 00030000 r4 : 9381b180 r3 : 00000000 r2 : 00000000 r1 : 000005ea r0 : 00000000 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 10c53c7d Table: 4248c059 DAC: 00000015 Process klogd (pid: 2046, stack limit = 0x84eb02e8) [...] This is because netdev_alloc_skb() fails and 'mdp->rx_skbuff[entry]' is left NULL but sh_eth_rx() later uses it without checking. Add such check... Reported-by: Yasushi SHOJI <[email protected]> Signed-off-by: Sergei Shtylyov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent f61e2ee commit 248be83

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/renesas/sh_eth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,6 +1462,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
14621462
if (mdp->cd->shift_rd0)
14631463
desc_status >>= 16;
14641464

1465+
skb = mdp->rx_skbuff[entry];
14651466
if (desc_status & (RD_RFS1 | RD_RFS2 | RD_RFS3 | RD_RFS4 |
14661467
RD_RFS5 | RD_RFS6 | RD_RFS10)) {
14671468
ndev->stats.rx_errors++;
@@ -1477,12 +1478,11 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
14771478
ndev->stats.rx_missed_errors++;
14781479
if (desc_status & RD_RFS10)
14791480
ndev->stats.rx_over_errors++;
1480-
} else {
1481+
} else if (skb) {
14811482
if (!mdp->cd->hw_swap)
14821483
sh_eth_soft_swap(
14831484
phys_to_virt(ALIGN(rxdesc->addr, 4)),
14841485
pkt_len + 2);
1485-
skb = mdp->rx_skbuff[entry];
14861486
mdp->rx_skbuff[entry] = NULL;
14871487
if (mdp->cd->rpadir)
14881488
skb_reserve(skb, NET_IP_ALIGN);

0 commit comments

Comments
 (0)