瀏覽代碼

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>
Roel Kluin 16 年之前
父節點
當前提交
fb3ab105a5
共有 1 個文件被更改,包括 7 次插入0 次删除
  1. 7 0
      drivers/media/dvb/frontends/stv0900_core.c

+ 7 - 0
drivers/media/dvb/frontends/stv0900_core.c

@@ -1384,7 +1384,14 @@ static enum fe_stv0900_error stv0900_init_internal(struct dvb_frontend *fe,
 	} else {
 	} else {
 		state->internal = kmalloc(sizeof(struct stv0900_internal),
 		state->internal = kmalloc(sizeof(struct stv0900_internal),
 								GFP_KERNEL);
 								GFP_KERNEL);
+		if (state->internal == NULL)
+			return STV0900_INVALID_HANDLE;
 		temp_int = append_internal(state->internal);
 		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->dmds_used = 1;
 		state->internal->i2c_adap = state->i2c_adap;
 		state->internal->i2c_adap = state->i2c_adap;
 		state->internal->i2c_addr = state->config->demod_address;
 		state->internal->i2c_addr = state->config->demod_address;