[3.13.y-ckt stable] Patch "NET: ROSE: Don't dereference NULL neighbour pointer." has been added to staging queue
Kamal Mostafa
kamal at canonical.com
Thu Jul 23 01:58:34 UTC 2015
This is a note to let you know that I have just added a patch titled
NET: ROSE: Don't dereference NULL neighbour pointer.
to the linux-3.13.y-queue branch of the 3.13.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.13.y-queue
This patch is scheduled to be released in version 3.13.11-ckt24.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.13.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
------
>From e5c827230a6ed3084211e32e0b5e1a7f6fae8536 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf at linux-mips.org>
Date: Fri, 19 Jun 2015 00:46:53 +0200
Subject: NET: ROSE: Don't dereference NULL neighbour pointer.
commit d496f7842aada20c61e6044b3395383fa972872c upstream.
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 at linux-mips.org>
Tested-by: Bernard Pidoux <f6bvp at free.fr>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
net/rose/af_rose.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 62ced65..4a719a5 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;
}
}
--
1.9.1
More information about the kernel-team
mailing list