From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Mon, 7 Mar 2016 22:36:28 +0000 (+0300)
Subject: sh_eth: fix NULL pointer dereference in sh_eth_ring_format()
X-Git-Tag: v4.1.12-92~15^2~82
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ad94d1fec858b86a2f719af3e340f2edda49357d;p=users%2Fjedix%2Flinux-maple.git

sh_eth: fix NULL pointer dereference in sh_eth_ring_format()

Orabug: 25308055

[ 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: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit c5e6283a4379eaae2d7fe596fc29ea02a14ac818)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 13463c4acc86..51eff9fefb4e 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1173,7 +1173,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);