Skip to content

Commit

Permalink
NET: ROSE: Don't dereference NULL neighbour pointer.
Browse files Browse the repository at this point in the history
[ Upstream commit d496f78 ]

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 ValveSoftware#2.6.11+
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
  • Loading branch information
ralfbaechle authored and vivek committed Aug 6, 2015
1 parent 4ae68e0 commit 5cb299c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion net/rose/af_rose.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down

0 comments on commit 5cb299c

Please sign in to comment.