Commit d9d691f5 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds

drivers/tty/bfin_jtag_comm.c: avoid calling put_tty_driver on NULL

put_tty_driver calls tty_driver_kref_put on its argument, and then
tty_driver_kref_put calls kref_put on the address of a field of this
argument.  kref_put checks for NULL, but in this case the field is likely
to have some offset and so the result of taking its address will not be
NULL.  Labels are added to be able to skip over the call to put_tty_driver
when the argument will be NULL.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression *x;
@@

*if (x == NULL)
{ ...
* put_tty_driver(x);
  ...
  return ...;
}
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Cc: Torben Hohn <torbenh@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 73210a13
...@@ -251,11 +251,11 @@ static int __init bfin_jc_init(void) ...@@ -251,11 +251,11 @@ static int __init bfin_jc_init(void)
bfin_jc_write_buf.head = bfin_jc_write_buf.tail = 0; bfin_jc_write_buf.head = bfin_jc_write_buf.tail = 0;
bfin_jc_write_buf.buf = kmalloc(CIRC_SIZE, GFP_KERNEL); bfin_jc_write_buf.buf = kmalloc(CIRC_SIZE, GFP_KERNEL);
if (!bfin_jc_write_buf.buf) if (!bfin_jc_write_buf.buf)
goto err; goto err_buf;
bfin_jc_driver = alloc_tty_driver(1); bfin_jc_driver = alloc_tty_driver(1);
if (!bfin_jc_driver) if (!bfin_jc_driver)
goto err; goto err_driver;
bfin_jc_driver->owner = THIS_MODULE; bfin_jc_driver->owner = THIS_MODULE;
bfin_jc_driver->driver_name = DRV_NAME; bfin_jc_driver->driver_name = DRV_NAME;
...@@ -275,7 +275,9 @@ static int __init bfin_jc_init(void) ...@@ -275,7 +275,9 @@ static int __init bfin_jc_init(void)
err: err:
put_tty_driver(bfin_jc_driver); put_tty_driver(bfin_jc_driver);
err_driver:
kfree(bfin_jc_write_buf.buf); kfree(bfin_jc_write_buf.buf);
err_buf:
kthread_stop(bfin_jc_kthread); kthread_stop(bfin_jc_kthread);
return ret; return ret;
} }
......
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