summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2011-10-12 11:32:42 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-18 14:22:36 -0700
commitc290f8358acaeffd8e0c551ddcc24d1206143376 (patch)
treef28068fd3da69c77b179d3955ec678c7ddeb7067
parent64d91cfaade2155ad048fe3b65238a052e29dde4 (diff)
downloadop-kernel-dev-c290f8358acaeffd8e0c551ddcc24d1206143376.zip
op-kernel-dev-c290f8358acaeffd8e0c551ddcc24d1206143376.tar.gz
TTY: drop driver reference in tty_open fail path
When tty_driver_lookup_tty fails in tty_open, we forget to drop a reference to the tty driver. This was added by commit 4a2b5fddd5 (Move tty lookup/reopen to caller). Fix that by adding tty_driver_kref_put to the fail path. I will refactor the code later. This is for the ease of backporting to stable. Introduced-in: v2.6.28-rc2 Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: stable <stable@vger.kernel.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Acked-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/tty/tty_io.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 4ca4bcd2..6913da8 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1873,6 +1873,7 @@ got_driver:
if (IS_ERR(tty)) {
tty_unlock();
mutex_unlock(&tty_mutex);
+ tty_driver_kref_put(driver);
return PTR_ERR(tty);
}
}
OpenPOWER on IntegriCloud