Skip to content

Commit

Permalink
sunsu: Fix use after free in su_remove().
Browse files Browse the repository at this point in the history
Real serial port 'up' objects are statically allocated from an
array in the driver.  Keyboard and mouse ports, on the other
hand, are dynamically allocated.

Unfortunately, we free these dynamic 'up' objects before we unmap the
I/O registers.

Rearrange su_remove() so that this does not happen.

Noticed by Julia Lawall.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 27, 2010
1 parent 7c1f6af commit 9616ff4
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/serial/sunsu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1500,20 +1500,25 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m
static int __devexit su_remove(struct of_device *op)
{
struct uart_sunsu_port *up = dev_get_drvdata(&op->dev);
bool kbdms = false;

if (up->su_type == SU_PORT_MS ||
up->su_type == SU_PORT_KBD) {
up->su_type == SU_PORT_KBD)
kbdms = true;

if (kbdms) {
#ifdef CONFIG_SERIO
serio_unregister_port(&up->serio);
#endif
kfree(up);
} else if (up->port.type != PORT_UNKNOWN) {
} else if (up->port.type != PORT_UNKNOWN)
uart_remove_one_port(&sunsu_reg, &up->port);
}

if (up->port.membase)
of_iounmap(&op->resource[0], up->port.membase, up->reg_size);

if (kbdms)
kfree(up);

dev_set_drvdata(&op->dev, NULL);

return 0;
Expand Down

0 comments on commit 9616ff4

Please sign in to comment.