pty: Fix locking bug on error path

We end up dropping the mutex twice on some errors. We don't want to do
that.

Reported-by: Fengguang Wu <[email protected]>
Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 2bace847eb3973010f45848b48c8d28da351fd6b..a82b39939a9cab4fc02a6d6d0be13607284d68ce 100644 (file)
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -628,6 +628,7 @@ static int ptmx_open(struct inode *inode, struct file *filp)
        index = devpts_new_index(inode);
        if (index < 0) {
                retval = index;
+               mutex_unlock(&devpts_mutex);
                goto err_file;
        }
 
@@ -667,7 +668,6 @@ out:
        mutex_unlock(&tty_mutex);
        devpts_kill_index(inode, index);
 err_file:
-        mutex_unlock(&devpts_mutex);
        tty_free_file(filp);
        return retval;
 }