From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60097 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751840AbcDPQgl (ORCPT ); Sat, 16 Apr 2016 12:36:41 -0400 Subject: Patch "sh_eth: fix NULL pointer dereference in sh_eth_ring_format()" has been added to the 4.5-stable tree To: sergei.shtylyov@cogentembedded.com, davem@davemloft.net, gregkh@linuxfoundation.org, wsa+renesas@sang-engineering.com Cc: , From: Date: Sat, 16 Apr 2016 09:35:45 -0700 Message-ID: <146082454518643@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled sh_eth: fix NULL pointer dereference in sh_eth_ring_format() to the 4.5-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sh_eth-fix-null-pointer-dereference-in-sh_eth_ring_format.patch and it can be found in the queue-4.5 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Sat Apr 16 09:15:18 PDT 2016 From: Sergei Shtylyov Date: Tue, 8 Mar 2016 01:36:28 +0300 Subject: sh_eth: fix NULL pointer dereference in sh_eth_ring_format() From: Sergei Shtylyov [ 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 Signed-off-by: Sergei Shtylyov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/renesas/sh_eth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1163,7 +1163,8 @@ static void sh_eth_ring_format(struct ne mdp->dirty_rx = (u32) (i - mdp->num_rx_ring); /* Mark the last entry as wrapping the ring. */ - rxdesc->status |= cpu_to_le32(RD_RDLE); + if (rxdesc) + rxdesc->status |= cpu_to_le32(RD_RDLE); memset(mdp->tx_ring, 0, tx_ringsize); Patches currently in stable-queue which might be from sergei.shtylyov@cogentembedded.com are queue-4.5/sh_eth-fix-null-pointer-dereference-in-sh_eth_ring_format.patch queue-4.5/sh_eth-advance-rxdesc-later-in-sh_eth_ring_format.patch