aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-03-25 22:52:22 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-05-20 09:28:24 -0300
commit0cff593732fa5bdf07192be741a567b85a9c0cd3 (patch)
tree8a02817ba8409f815a69a1a02f7cbd840a351a43
parentce02704d48767bdd31eb0b804b1d45da5b683a8c (diff)
downloadkernel_samsung_aries-0cff593732fa5bdf07192be741a567b85a9c0cd3.zip
kernel_samsung_aries-0cff593732fa5bdf07192be741a567b85a9c0cd3.tar.gz
kernel_samsung_aries-0cff593732fa5bdf07192be741a567b85a9c0cd3.tar.bz2
[media] pvrusb2: check for allocation failures
This function returns NULL on failure so lets do that if kzalloc() fails. There is a separate problem that the caller for this function doesn't check for errors... Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-By: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-std.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-std.c b/drivers/media/video/pvrusb2/pvrusb2-std.c
index ca9f83a..35c8b40 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -370,7 +370,11 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
stddefs = kzalloc(sizeof(struct v4l2_standard) * std_cnt,
GFP_KERNEL);
- for (idx = 0; idx < std_cnt; idx++) stddefs[idx].index = idx;
+ if (!stddefs)
+ return NULL;
+
+ for (idx = 0; idx < std_cnt; idx++)
+ stddefs[idx].index = idx;
idx = 0;