summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-09-18 21:03:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:53:35 -0300
commit40d2951758d788a0375d27062caf9cc75de735a9 (patch)
tree2ad2264b382d88039354482e65785ed4be667d64 /drivers/media
parentd8370f7eff14ef646ba4a81eb9642800518a7324 (diff)
downloadlinux-3.10-40d2951758d788a0375d27062caf9cc75de735a9.tar.gz
linux-3.10-40d2951758d788a0375d27062caf9cc75de735a9.tar.bz2
linux-3.10-40d2951758d788a0375d27062caf9cc75de735a9.zip
V4L/DVB (13018): kzalloc failure ignored in au8522_probe()
Prevent NULL dereference if kzalloc() fails. Cc: Devin Heitmueller <dheitmueller@linuxtv.org> Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/frontends/au8522_decoder.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 9e9a75576a1..74981ee923c 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -792,6 +792,11 @@ static int au8522_probe(struct i2c_client *client,
}
demod_config = kzalloc(sizeof(struct au8522_config), GFP_KERNEL);
+ if (demod_config == NULL) {
+ if (instance == 1)
+ kfree(state);
+ return -ENOMEM;
+ }
demod_config->demod_address = 0x8e >> 1;
state->config = demod_config;