From: Roel Kluin <roel.kluin@gmail.com>
Date: Sat, 29 Aug 2009 18:31:49 +0000 (-0300)
Subject: V4L/DVB: stv0900: dereference of state->internal in fe_stv0900_error stv0900_init_int... 
X-Git-Tag: v2.6.34-rc1~280^2~154
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fb3ab105a5ef43b03d2788e9b124c7c69112682f;p=~emulex%2Finfiniband.git

V4L/DVB: stv0900: dereference of state->internal in fe_stv0900_error stv0900_init_internal()

state->internal allocation may fail as well as the allocation of
stv0900_first_inode or new_node->next_inode in append_internal().

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c
index 74791d550dc..e5791b2b913 100644
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -1384,7 +1384,14 @@ static enum fe_stv0900_error stv0900_init_internal(struct dvb_frontend *fe,
 	} else {
 		state->internal = kmalloc(sizeof(struct stv0900_internal),
 								GFP_KERNEL);
+		if (state->internal == NULL)
+			return STV0900_INVALID_HANDLE;
 		temp_int = append_internal(state->internal);
+		if (temp_int == NULL) {
+			kfree(state->internal);
+			state->internal = NULL;
+			return STV0900_INVALID_HANDLE;
+		}
 		state->internal->dmds_used = 1;
 		state->internal->i2c_adap = state->i2c_adap;
 		state->internal->i2c_addr = state->config->demod_address;