From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 18 Jun 2015 22:46:53 +0000 (+0200)
Subject: NET: ROSE: Don't dereference NULL neighbour pointer.
X-Git-Tag: v4.2-rc1~130^2~2^2~7
X-Git-Url: http://git.osdn.net/view?p=uclinux-h8%2Flinux.git;a=commitdiff_plain;h=d496f7842aada20c61e6044b3395383fa972872c

NET: ROSE: Don't dereference NULL neighbour pointer.

A ROSE socket doesn't necessarily always have a neighbour pointer so check
if the neighbour pointer is valid before dereferencing it.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Tested-by: Bernard Pidoux <f6bvp@free.fr>
Cc: stable@vger.kernel.org #2.6.11+
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 8ae603069a1a..dd304bc40788 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -192,7 +192,8 @@ static void rose_kill_by_device(struct net_device *dev)
 
 		if (rose->device == dev) {
 			rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0);
-			rose->neighbour->use--;
+			if (rose->neighbour)
+				rose->neighbour->use--;
 			rose->device = NULL;
 		}
 	}