Commit db179e0d authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Rob Herring

of: do not leak console options

Do not strdup() console options. It seems that the only reason for
it to be strdup()-ed was a compilation warning: printk, UART and
console drivers, for some reason, expect char pointer instead of
const char pointer. So we can just pass `of_stdout_options', but
need to cast it to char pointer. A better fix would be to change
printk, console drivers and UART to accept const char `options';
but that will take time - there are lots of drivers to update.

The patch also fixes a possible memory leak: add_preferred_console()
can fail, but we don't kfree() options.
Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 8a5776a5
...@@ -1781,8 +1781,12 @@ bool of_console_check(struct device_node *dn, char *name, int index) ...@@ -1781,8 +1781,12 @@ bool of_console_check(struct device_node *dn, char *name, int index)
{ {
if (!dn || dn != of_stdout || console_set_on_cmdline) if (!dn || dn != of_stdout || console_set_on_cmdline)
return false; return false;
return !add_preferred_console(name, index,
kstrdup(of_stdout_options, GFP_KERNEL)); /*
* XXX: cast `options' to char pointer to suppress complication
* warnings: printk, UART and console drivers expect char pointer.
*/
return !add_preferred_console(name, index, (char *)of_stdout_options);
} }
EXPORT_SYMBOL_GPL(of_console_check); EXPORT_SYMBOL_GPL(of_console_check);
......
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