summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-10-13 10:43:48 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 09:51:44 -0700
commit335adde689150d2fcf4df3cb26a6fc6740ed1f3e (patch)
tree93e11b89e96e8baf15a276e4008e08bb5873fb90
parentfe9cd962a62cb5f666cf48b9941d3f3cde134254 (diff)
downloadkernel-crypto-335adde689150d2fcf4df3cb26a6fc6740ed1f3e.tar.gz
kernel-crypto-335adde689150d2fcf4df3cb26a6fc6740ed1f3e.tar.xz
kernel-crypto-335adde689150d2fcf4df3cb26a6fc6740ed1f3e.zip
pty: Fix allocation failure double free
The updating and moving around of the pty code added a bug where both the helper and caller free the main tty struct (the pty driver must free the o_tty pair itself however). Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/pty.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index c3ab8c3110c..3c6b7911665 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -544,8 +544,6 @@ free_mem_out:
module_put(o_tty->driver->owner);
free_tty_struct(o_tty);
pty_unix98_shutdown(tty);
- free_tty_struct(tty);
- module_put(driver->owner);
return -ENOMEM;
}