summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-24 02:42:14 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-24 13:54:16 -0700
commitc66b9b7d365444b433307ebb18734757cb668a02 (patch)
tree36a8742f784bd7f0b18df92689ba9142b3431476 /drivers/net
parent3324d024ba4bebb74a78d84b925b59df73a92fbd (diff)
downloadlinux-3.10-c66b9b7d365444b433307ebb18734757cb668a02.tar.gz
linux-3.10-c66b9b7d365444b433307ebb18734757cb668a02.tar.bz2
linux-3.10-c66b9b7d365444b433307ebb18734757cb668a02.zip
caif: fix NULL pointer check
Reported-by: <rucsoftsec@gmail.com> Resolves-bug: http://bugzilla.kernel.org/show_bug?44441 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/caif/caif_serial.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c
index 8a3054b8481..5de74e76202 100644
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
@@ -325,6 +325,9 @@ static int ldisc_open(struct tty_struct *tty)
sprintf(name, "cf%s", tty->name);
dev = alloc_netdev(sizeof(*ser), name, caifdev_setup);
+ if (!dev)
+ return -ENOMEM;
+
ser = netdev_priv(dev);
ser->tty = tty_kref_get(tty);
ser->dev = dev;