lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] TTY: pty, release tty in all ptmx_open fail paths
    Date
    Mistakenly, commit 64ba3dc3143d (tty: never hold BTM while getting
    tty_mutex) switched one fail path in ptmx_open to not free the newly
    allocated tty.

    Fix that by jumping to the appropriate place. And rename the labels so
    that it's clear what is going on there.

    Introduced-in: v2.6.36-rc2
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: stable@kernel.org
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/tty/pty.c | 10 +++++-----
    1 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
    index 696e851..e18604b 100644
    --- a/drivers/tty/pty.c
    +++ b/drivers/tty/pty.c
    @@ -699,15 +699,15 @@ static int ptmx_open(struct inode *inode, struct file *filp)

    retval = devpts_pty_new(inode, tty->link);
    if (retval)
    - goto out1;
    + goto err_release;

    retval = ptm_driver->ops->open(tty, filp);
    if (retval)
    - goto out2;
    -out1:
    + goto err_release;
    +
    tty_unlock();
    - return retval;
    -out2:
    + return 0;
    +err_release:
    tty_unlock();
    tty_release(inode, filp);
    return retval;
    --
    1.7.7



    \
     
     \ /
      Last update: 2011-10-12 11:45    [W:0.020 / U:0.312 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site