]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
pty: Fix allocation failure double free
authorAlan Cox <alan@redhat.com>
Mon, 13 Oct 2008 09:43:48 +0000 (10:43 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Oct 2008 16:51:44 +0000 (09:51 -0700)
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>
drivers/char/pty.c

index c3ab8c3110c97566bed5cf4dfea85010630895d6..3c6b7911665f80568938a7ba680568baafc7c6ed 100644 (file)
@@ -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;
 }