diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-03-08 01:36:28 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-18 17:49:20 +0200 |
| commit | f36a1644e067981263fe82a1eb2c13069c60fa5d (patch) | |
| tree | e20f68e7df8506e96c48d8591d3a10ff56267ab6 | |
| parent | 64a08e78fa83406a1a9bace07f8de6b104af2068 (diff) | |
| download | lwn-f36a1644e067981263fe82a1eb2c13069c60fa5d.tar.gz lwn-f36a1644e067981263fe82a1eb2c13069c60fa5d.zip | |
sh_eth: fix NULL pointer dereference in sh_eth_ring_format()
[ Upstream commit c1b7fca65070bfadca94dd53a4e6b71cd4f69715 ]
In a low memory situation, if netdev_alloc_skb() fails on a first RX ring
loop iteration in sh_eth_ring_format(), 'rxdesc' is still NULL. Avoid
kernel oops by adding the 'rxdesc' check after the loop.
Reported-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index bee6e49c5542..d4ecb2fff4e4 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1069,7 +1069,8 @@ static void sh_eth_ring_format(struct net_device *ndev) mdp->dirty_rx = (u32) (i - mdp->num_rx_ring); /* Mark the last entry as wrapping the ring. */ - rxdesc->status |= cpu_to_edmac(mdp, RD_RDEL); + if (rxdesc) + rxdesc->status |= cpu_to_edmac(mdp, RD_RDEL); memset(mdp->tx_ring, 0, tx_ringsize); |