AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

sx.c: fix missed unlock_kernel() on error path in sx_fw_ioctl()

Browse Source 
If we return directly with -EPERM then lock_kernel() is still held.

This was found with a code checker (http://repo.or.cz/w/smatch.git/).

[akpm@linux-foundation.org: fix another such path - missed func_exit()]
Signed-off-by: Dan Carpenter <error27@gmail.com>
Cc: <R.E.Wolff@BitWizard.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dan Carpenter 2009-02-04 15:12:20 -08:00 committed by Linus Torvalds
parent fe86175bce
commit 736d54533a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/char/sx.c
View File

@ -1713,8 +1713,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
for (i = 0; i < SX_NBOARDS; i++) for (i = 0; i < SX_NBOARDS; i++)
sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags); sx_dprintk(SX_DEBUG_FIRMWARE, "<%x> ", boards[i].flags);
sx_dprintk(SX_DEBUG_FIRMWARE, "\n"); sx_dprintk(SX_DEBUG_FIRMWARE, "\n");
unlock_kernel(); rc = -EIO;
return -EIO; goto out;
} }
switch (cmd) { switch (cmd) {
@ -1747,7 +1747,8 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
break; break;
case SXIO_DO_RAMTEST: case SXIO_DO_RAMTEST:
if (sx_initialized) /* Already initialized: better not ramtest the board. */ if (sx_initialized) /* Already initialized: better not ramtest the board. */
return -EPERM; rc = -EPERM;
break;
if (IS_SX_BOARD(board)) { if (IS_SX_BOARD(board)) {
rc = do_memtest(board, 0, 0x7000); rc = do_memtest(board, 0, 0x7000);
if (!rc) if (!rc)
@ -1844,6 +1845,7 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
rc = -ENOTTY; rc = -ENOTTY;
break; break;
} }
out:
unlock_kernel(); unlock_kernel();
func_exit(); func_exit();
return rc; return rc;