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 <fengguang.wu@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox 2012-09-19 15:34:47 +01:00 committed by Greg Kroah-Hartman
parent 43eca0aef7
commit 05fb79e45e

View file

@ -628,6 +628,7 @@ static int ptmx_open(struct inode *inode, struct file *filp)
index = devpts_new_index(inode); index = devpts_new_index(inode);
if (index < 0) { if (index < 0) {
retval = index; retval = index;
mutex_unlock(&devpts_mutex);
goto err_file; goto err_file;
} }
@ -667,7 +668,6 @@ out:
mutex_unlock(&tty_mutex); mutex_unlock(&tty_mutex);
devpts_kill_index(inode, index); devpts_kill_index(inode, index);
err_file: err_file:
mutex_unlock(&devpts_mutex);
tty_free_file(filp); tty_free_file(filp);
return retval; return retval;
} }