drivers/tty/moxa.c: Put correct tty value
authorJulia Lawall <julia@diku.dk>
Fri, 22 Apr 2011 20:46:21 +0000 (22:46 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 29 Apr 2011 21:17:45 +0000 (14:17 -0700)
The tty value that should be put is the one that was just gotten by
tty_port_tty_get, not the one that is the argument to the enclosing
function.

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

// <smpl>
@exists@
local idexpression struct tty_struct *x;
expression ra,rr;
statement S1,S2;
@@

x = tty_port_tty_get(...)
... when != x = rr
    when any
    when != tty_kref_put(x,...)
    when != if (...) { ... tty_kref_put(x,...) ...}
(
if(<+...x...+>) S1 else S2
|
if(...) { ... when != x = ra
     when forall
     when != tty_kref_put(x,...)
*return...;
}
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/tty/moxa.c

index 6255561dd2a3531e03c777ac2f8849e0726f76ac..ba679ce0a77456b1ecbeb6e674b67fbbb4ab1dac 100644 (file)
@@ -371,7 +371,7 @@ static int moxa_ioctl(struct tty_struct *tty,
                                        tmp.cflag = p->cflag;
                                else
                                        tmp.cflag = ttyp->termios->c_cflag;
-                               tty_kref_put(tty);
+                               tty_kref_put(ttyp);
 copy:
                                if (copy_to_user(argm, &tmp, sizeof(tmp)))
                                        return -EFAULT;