diff options
| author |   Julia Lawall <julia@diku.dk> | 2010-03-29 22:33:28 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-03-29 22:33:28 -0700 |
| commit | c4a3987fa075b2d15ebc3d59b01fb7ed403cd3e1 (patch) | |
| tree | b751350fb5c0abc2c8f636dae7429d409300be7f /drivers/serial/sunsu.c | |
| parent | sparc64: Properly truncate pt_regs framepointer in perf callback. (diff) | |
| download | linux-dev-c4a3987fa075b2d15ebc3d59b01fb7ed403cd3e1.tar.xz linux-dev-c4a3987fa075b2d15ebc3d59b01fb7ed403cd3e1.zip | |
drivers/serial/sunsu.c: Correct use after free
The of_iounmap is at the out_unmap label, but at that point up has already
been freed. The free cannot be moved to the out_unmap label, because that
label is reachable from cases where up should not be freed. So the call to
of_iounmap is just duplicated, and the goto converted to a return.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x,e;
identifier f;
iterator I;
statement S;
@@
*kfree(x);
... when != &x
when != x = e
when != I(x,...) S
*x->f
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/sunsu.c')
| -rw-r--r-- | drivers/serial/sunsu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 170d3d68c8f0..cbcfb1885f79 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c @@ -1453,8 +1453,10 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) { err = sunsu_kbd_ms_init(up); if (err) { + of_iounmap(&op->resource[0], + up->port.membase, up->reg_size); kfree(up); - goto out_unmap; + return err; } dev_set_drvdata(&op->dev, up); |