]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
USB: ftdi_sio: unlock_kernel() on error in set_serial_info()
authorDan Carpenter <error27@gmail.com>
Tue, 3 Feb 2009 08:11:38 +0000 (11:11 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 9 Feb 2009 19:19:48 +0000 (11:19 -0800)
There was one error path where unlock_kernel() wasn't called.

This was found with a code checker (http://repo.or.cz/w/smatch.git/)
Compile tested only, sorry.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/ftdi_sio.c

index 64b84291c07e4609f2a0af31588273ea4ee3558e..f92f4d77337487c76929bc58b78e85aa3a184799 100644 (file)
@@ -1065,8 +1065,10 @@ static int set_serial_info(struct tty_struct *tty,
 
        if (!capable(CAP_SYS_ADMIN)) {
                if (((new_serial.flags & ~ASYNC_USR_MASK) !=
-                    (priv->flags & ~ASYNC_USR_MASK)))
+                    (priv->flags & ~ASYNC_USR_MASK))) {
+                       unlock_kernel();
                        return -EPERM;
+               }
                priv->flags = ((priv->flags & ~ASYNC_USR_MASK) |
                               (new_serial.flags & ASYNC_USR_MASK));
                priv->custom_divisor = new_serial.custom_divisor;