From: Alan Cox <alan@redhat.com>
Date: Mon, 13 Oct 2008 09:43:48 +0000 (+0100)
Subject: pty: Fix allocation failure double free
X-Git-Tag: v2.6.28-rc1~625
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=335adde689150d2fcf4df3cb26a6fc6740ed1f3e;p=linux-2.6-omap-h63xx.git

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>
---

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;
 }