Commit faf29338 authored by Adam Ford's avatar Adam Ford Committed by Stephen Boyd

clk: vc5: Add memory check to prevent oops

When getting the names of the child nodes, kasprintf is used to
allocate memory which is used to create the string for the node
name.  Unfortunately, there is no memory check to determine
if this allocation fails, it may cause an error when trying
to get child node name.

This patch will check if the memory allocation fails, and returns
and -ENOMEM error instead of blindly moving on.

Fixes: 260249f9 ("clk: vc5: Enable addition output configurations of the Versaclock")
Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarAdam Ford <aford173@gmail.com>
Reviewed-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Link: https://lore.kernel.org/r/20200716122620.4538-1-aford173@gmail.comSigned-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 8200597f
......@@ -789,10 +789,13 @@ static int vc5_get_output_config(struct i2c_client *client,
int ret = 0;
child_name = kasprintf(GFP_KERNEL, "OUT%d", clk_out->num + 1);
if (!child_name)
return -ENOMEM;
np_output = of_get_child_by_name(client->dev.of_node, child_name);
kfree(child_name);
if (!np_output)
goto output_done;
return 0;
ret = vc5_update_mode(np_output, clk_out);
if (ret)
......@@ -813,7 +816,6 @@ static int vc5_get_output_config(struct i2c_client *client,
of_node_put(np_output);
output_done:
return ret;
}
......@@ -828,7 +830,7 @@ static int vc5_probe(struct i2c_client *client, const struct i2c_device_id *id)
int ret;
vc5 = devm_kzalloc(&client->dev, sizeof(*vc5), GFP_KERNEL);
if (vc5 == NULL)
if (!vc5)
return -ENOMEM;
i2c_set_clientdata(client, vc5);
......
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