[patch] [media] stv090x: handle allocation failures

[Dan Carpenter]

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.

Signed-off-by: Dan Carpenter <erro...@gmail.com>
---
Compile tested only.  I'm not very familiar with this code.

diff --git a/drivers/media/dvb/frontends/stv090x.c 
b/drivers/media/dvb/frontends/stv090x.c
index d3362d0..85101e8 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -4783,7 +4783,13 @@ struct dvb_frontend *stv090x_attach(const struct 
stv090x_config *config,
        } else {
                state->internal = kmalloc(sizeof(struct stv090x_internal),
                                          GFP_KERNEL);
+               if (!state->internal)
+                       goto error;
                temp_int = append_internal(state->internal);
+               if (!temp_int) {
+                       kfree(state->internal);
+                       goto error;
+               }
                state->internal->num_used = 1;
                state->internal->mclk = 0;
                state->internal->dev_ver = 0;
@@ -4796,7 +4802,7 @@ struct dvb_frontend *stv090x_attach(const struct 
stv090x_config *config,
 
                if (stv090x_setup(&state->frontend) < 0) {
                        dprintk(FE_ERROR, 1, "Error setting up device");
-                       goto error;
+                       goto err_remove;
                }
        }
 
@@ -4811,6 +4817,8 @@ struct dvb_frontend *stv090x_attach(const struct 
stv090x_config *config,
 
        return &state->frontend;
 
+err_remove:
+       remove_dev(state->internal);
 error:
        kfree(state);
        return NULL;
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html