Commit 07988007 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab

[media] stv090x: handle allocation failures

kmalloc() can fail so check whether state->internal is NULL.
append_internal() can return NULL on allocation failures so check that.
Also if we hit the error condition later in the function then there is
a memory leak and we need to call remove_dev() to fix it.

Also Oliver Endriss pointed out an additional leak that I missed in the
first version of this patch.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 57f05bfa
...@@ -4783,7 +4783,13 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, ...@@ -4783,7 +4783,13 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config,
} else { } else {
state->internal = kmalloc(sizeof(struct stv090x_internal), state->internal = kmalloc(sizeof(struct stv090x_internal),
GFP_KERNEL); GFP_KERNEL);
if (!state->internal)
goto error;
temp_int = append_internal(state->internal); temp_int = append_internal(state->internal);
if (!temp_int) {
kfree(state->internal);
goto error;
}
state->internal->num_used = 1; state->internal->num_used = 1;
state->internal->mclk = 0; state->internal->mclk = 0;
state->internal->dev_ver = 0; state->internal->dev_ver = 0;
...@@ -4796,7 +4802,7 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, ...@@ -4796,7 +4802,7 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config,
if (stv090x_setup(&state->frontend) < 0) { if (stv090x_setup(&state->frontend) < 0) {
dprintk(FE_ERROR, 1, "Error setting up device"); dprintk(FE_ERROR, 1, "Error setting up device");
goto error; goto err_remove;
} }
} }
...@@ -4811,6 +4817,9 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config, ...@@ -4811,6 +4817,9 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config,
return &state->frontend; return &state->frontend;
err_remove:
remove_dev(state->internal);
kfree(state->internal);
error: error:
kfree(state); kfree(state);
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment