[PATCH] sx.c: fix dbl statement if - add missing braces

[PATCH] sx.c: fix dbl statement if - add missing braces

[Ilpo Järvinen]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 978 bytes --]


Caused by 736d54533aed (sx.c: fix missed unlock_kernel()
on error path in sx_fw_ioctl()). You guys keep breaking
things this way in every single kernel release in at least
couple of places... :-(

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Cc: Dan Carpenter <error27@gmail.com>
---
 drivers/char/sx.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index f146e90..d7c4165 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -1746,9 +1746,10 @@ static long sx_fw_ioctl(struct file *filp, unsigned int cmd,
 		sx_dprintk(SX_DEBUG_FIRMWARE, "returning type= %ld\n", rc);
 		break;
 	case SXIO_DO_RAMTEST:
-		if (sx_initialized)	/* Already initialized: better not ramtest the board.  */
+		if (sx_initialized) {	/* Already initialized: better not ramtest the board.  */
 			rc = -EPERM;
 			break;
+		}
 		if (IS_SX_BOARD(board)) {
 			rc = do_memtest(board, 0, 0x7000);
 			if (!rc)
-- 
1.5.2.2

Re: [PATCH] sx.c: fix dbl statement if - add missing braces

[Dan Carpenter]

On 2/18/09, Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> wrote:
>
> Caused by 736d54533aed (sx.c: fix missed unlock_kernel()
> on error path in sx_fw_ioctl()). You guys keep breaking
> things this way in every single kernel release in at least
> couple of places... :-(
>

Yep.  Sorry about that.

Signed-off-by: Dan Carpenter <error27@gmail.com>

regards,
dan carpenter

> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
> Cc: Dan Carpenter <error27@gmail.com>
> ---
>  drivers/char/sx.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/char/sx.c b/drivers/char/sx.c
> index f146e90..d7c4165 100644
> --- a/drivers/char/sx.c
> +++ b/drivers/char/sx.c
> @@ -1746,9 +1746,10 @@ static long sx_fw_ioctl(struct file *filp, unsigned
> int cmd,
>  		sx_dprintk(SX_DEBUG_FIRMWARE, "returning type= %ld\n", rc);
>  		break;
>  	case SXIO_DO_RAMTEST:
> -		if (sx_initialized)	/* Already initialized: better not ramtest the board.
>  */
> +		if (sx_initialized) {	/* Already initialized: better not ramtest the
> board.  */
>  			rc = -EPERM;
>  			break;
> +		}
>  		if (IS_SX_BOARD(board)) {
>  			rc = do_memtest(board, 0, 0x7000);
>  			if (!rc)
> --
> 1.5.2.2
>

Re: [PATCH] sx.c: fix dbl statement if - add missing braces

[Dan Carpenter]

While we're at it, here is another patch for that file.

The "break" would just result in reusing a free'd pointer.  I don't have 
the cards myself to test it though.  :/

regards,
dan carpenter

Signed-off-by: Dan Carpenter <error27@gmail.com>

--- orig/drivers/char/sx.c	2009-02-19 11:27:51.000000000 +0300
+++ devel/drivers/char/sx.c	2009-02-19 11:29:05.000000000 +0300
@@ -1788,7 +1788,7 @@
  						nbytes - i : SX_CHUNK_SIZE)) {
  					kfree(tmp);
  					rc = -EFAULT;
-					break;
+					goto out;
  				}
  				memcpy_toio(board->base2 + offset + i, tmp,
  						(i + SX_CHUNK_SIZE > nbytes) ?
@@ -1845,6 +1845,7 @@
  		rc = -ENOTTY;
  		break;
  	}
+out:
  	unlock_kernel();
  	func_exit();
  	return rc;