summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-09-23 15:57:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 07:21:05 -0700
commit9e5f1138d76e45b0ce56314ba0587e5942b55dcc (patch)
tree992d0406fafc53738f5c1f42b9e28682d3cb5dee /drivers/misc
parentf8679af874b604db78d59d2a0a873a7f3d542842 (diff)
downloadlinux-9e5f1138d76e45b0ce56314ba0587e5942b55dcc.tar.gz
linux-9e5f1138d76e45b0ce56314ba0587e5942b55dcc.tar.bz2
linux-9e5f1138d76e45b0ce56314ba0587e5942b55dcc.zip
gru: allocation may fail in quicktest1()
The allocation may fail. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Jack Steiner <steiner@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/sgi-gru/grukservices.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c
index 79689b10f937..766e21e15574 100644
--- a/drivers/misc/sgi-gru/grukservices.c
+++ b/drivers/misc/sgi-gru/grukservices.c
@@ -937,6 +937,8 @@ static int quicktest1(unsigned long arg)
/* Need 1K cacheline aligned that does not cross page boundary */
p = kmalloc(4096, 0);
+ if (p == NULL)
+ return -ENOMEM;
mq = ALIGNUP(p, 1024);
memset(mes, 0xee, sizeof(mes));
dw = mq;