Commit 9e845abf authored by André Goddard Rosa's avatar André Goddard Rosa Committed by Greg Kroah-Hartman

serial: fix NULL pointer dereference

If kzalloc() or alloc_tty_driver() fails, we call:
    put_tty_driver(normal = NULL).

Then:
    put_tty_driver -> tty_driver_kref_put -> kref_put(&NULL->kref, ...)
Signed-off-by: default avatarAndré Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2a0785ea
...@@ -2344,7 +2344,7 @@ static const struct tty_operations uart_ops = { ...@@ -2344,7 +2344,7 @@ static const struct tty_operations uart_ops = {
*/ */
int uart_register_driver(struct uart_driver *drv) int uart_register_driver(struct uart_driver *drv)
{ {
struct tty_driver *normal = NULL; struct tty_driver *normal;
int i, retval; int i, retval;
BUG_ON(drv->state); BUG_ON(drv->state);
...@@ -2354,13 +2354,12 @@ int uart_register_driver(struct uart_driver *drv) ...@@ -2354,13 +2354,12 @@ int uart_register_driver(struct uart_driver *drv)
* we have a large number of ports to handle. * we have a large number of ports to handle.
*/ */
drv->state = kzalloc(sizeof(struct uart_state) * drv->nr, GFP_KERNEL); drv->state = kzalloc(sizeof(struct uart_state) * drv->nr, GFP_KERNEL);
retval = -ENOMEM;
if (!drv->state) if (!drv->state)
goto out; goto out;
normal = alloc_tty_driver(drv->nr); normal = alloc_tty_driver(drv->nr);
if (!normal) if (!normal)
goto out; goto out_kfree;
drv->tty_driver = normal; drv->tty_driver = normal;
...@@ -2393,12 +2392,14 @@ int uart_register_driver(struct uart_driver *drv) ...@@ -2393,12 +2392,14 @@ int uart_register_driver(struct uart_driver *drv)
} }
retval = tty_register_driver(normal); retval = tty_register_driver(normal);
out: if (retval >= 0)
if (retval < 0) { return retval;
put_tty_driver(normal); put_tty_driver(normal);
out_kfree:
kfree(drv->state); kfree(drv->state);
} out:
return retval; return -ENOMEM;
} }
/** /**
......
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