aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-04-22 22:46:21 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-29 14:17:45 -0700
commitdf43daaae926c3710eda911ec048808c904572fe (patch)
tree02c6eabf1a21bbbd91ed0dda7f94a67b2f096034 /drivers/tty
parentTTY: tty_io, annotate locking functions (diff)
downloadlinux-dev-df43daaae926c3710eda911ec048808c904572fe.tar.xz
linux-dev-df43daaae926c3710eda911ec048808c904572fe.zip
drivers/tty/moxa.c: Put correct tty value
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/moxa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index 6255561dd2a3..ba679ce0a774 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -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;