summaryrefslogtreecommitdiffstats
path: root/drivers/staging/slicoss
diff options
context:
space:
mode:
authorDevendra Naga2012-10-24 00:04:32 +0200
committerGreg Kroah-Hartman2012-10-24 05:28:20 +0200
commit0608882d01671983be20097e3ffd6be20c9a7724 (patch)
treeb379fd235067ee673841466cb8f2e39c4b8d400e /drivers/staging/slicoss
parentstaging: comedi: auto-config drivers do not need to set hw_dev (diff)
downloadkernel-qcow2-linux-0608882d01671983be20097e3ffd6be20c9a7724.tar.gz
kernel-qcow2-linux-0608882d01671983be20097e3ffd6be20c9a7724.tar.xz
kernel-qcow2-linux-0608882d01671983be20097e3ffd6be20c9a7724.zip
staging: slicoss: return -ENOMEM if kzalloc fail
this takes up the error path cleanup, fixes a crash too due to null deref Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/slicoss')
-rw-r--r--drivers/staging/slicoss/slicoss.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 945428084914..f6af3fe46c5e 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -3667,6 +3667,8 @@ static u32 slic_card_locate(struct adapter *adapter)
if (!physcard) {
/* no structure allocated for this physical card yet */
physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);
+ if (!physcard)
+ return -ENOMEM;
physcard->next = slic_global.phys_card;
slic_global.phys_card = physcard;