[PATCH] staging: comedi: ni_660x: fix missing break in switch statement

[PATCH] staging: comedi: ni_660x: fix missing break in switch statement

[Gustavo A. R. Silva]

Add missing break statement in order to prevent the code from falling
through to the default case and return -EINVAL every time.

This bug was found thanks to the ongoing efforts to enable
-Wimplicit-fallthrough.

Fixes: 58dd7c0a2a6e ("Staging: comedi: add ni_660x driver")
Cc: stable@vger.kernel.org
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
---
 drivers/staging/comedi/drivers/ni_660x.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index e70a461e723f..405573e927cf 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -656,6 +656,7 @@ static int ni_660x_set_pfi_routing(struct comedi_device *dev,
 	case NI_660X_PFI_OUTPUT_DIO:
 		if (chan > 31)
 			return -EINVAL;
+		break;
 	default:
 		return -EINVAL;
 	}
-- 
2.20.1

Re: [PATCH] staging: comedi: ni_660x: fix missing break in switch statement

[Gustavo A. R. Silva]

Hi,

Please, drop this.

I've just sent v2 with the right Fixes tag:

https://lore.kernel.org/patchwork/patch/1041301/

Thanks
--
Gustavo

On 2/12/19 12:08 PM, Gustavo A. R. Silva wrote:
> Add missing break statement in order to prevent the code from falling
> through to the default case and return -EINVAL every time.
> 
> This bug was found thanks to the ongoing efforts to enable
> -Wimplicit-fallthrough.
> 
> Fixes: 58dd7c0a2a6e ("Staging: comedi: add ni_660x driver")
> Cc: stable@vger.kernel.org
> Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
> ---
>  drivers/staging/comedi/drivers/ni_660x.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
> index e70a461e723f..405573e927cf 100644
> --- a/drivers/staging/comedi/drivers/ni_660x.c
> +++ b/drivers/staging/comedi/drivers/ni_660x.c
> @@ -656,6 +656,7 @@ static int ni_660x_set_pfi_routing(struct comedi_device *dev,
>  	case NI_660X_PFI_OUTPUT_DIO:
>  		if (chan > 31)
>  			return -EINVAL;
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
> 

Re: [PATCH] staging: comedi: ni_660x: fix missing break in switch statement

[Ian Abbott]

On 15/02/2019 15:48, Sasha Levin wrote:
> Hi,
> 
> [This is an automated email]
> 
> This commit has been processed because it contains a "Fixes:" tag,
> fixing commit: 58dd7c0a2a6e Staging: comedi: add ni_660x driver.
> 
> The bot has tested the following trees: v4.20.8, v4.19.21, v4.14.99, v4.9.156, v4.4.174, v3.18.134.
> 
> v4.20.8: Build OK!
> v4.19.21: Build OK!
> v4.14.99: Build OK!
> v4.9.156: Build OK!
> v4.4.174: Failed to apply! Possible dependencies:
>      01ead0ded315 ("staging: comedi: ni_660x: cleanup the NI660X_IO_CFG register helpers")
>      22acd860137a ("staging: comedi: ni_660x: change IOConfigReg() into a macro")
>      41014593caeb ("staging: comedi: ni_660x: cleanup the NI660X_GLOBAL_INT_{STATUS, CFG}")
>      502552e161ae ("staging: comedi: ni_660x: remove enum clock_config_register_bits")
>      518d38423b48 ("staging: comedi: ni_660x: tidy up ni_660x_select_pfi_output()")
>      9678b73e273a ("staging: comedi: ni_660x: tidy up ni_660x_write_register()")
>      aa94f2888825 ("staging: comedi: ni_660x: tidy up ni_660x_set_pfi_routing()")
>      ad98c18cb9de ("staging: comedi: ni_660x: tidy up ni_660x_read_register()")
>      cded944fa90c ("staging: comedi: ni_660x: Prefer kernel type 'u64' over 'uint64_t'")
>      fecf4cce0021 ("staging: comedi: ni_660x: cleanup the NI660X_DMA_CFG register helpers")
> 
> v3.18.134: Failed to apply! Possible dependencies:
>      01ead0ded315 ("staging: comedi: ni_660x: cleanup the NI660X_IO_CFG register helpers")
>      22acd860137a ("staging: comedi: ni_660x: change IOConfigReg() into a macro")
>      41014593caeb ("staging: comedi: ni_660x: cleanup the NI660X_GLOBAL_INT_{STATUS, CFG}")
>      502552e161ae ("staging: comedi: ni_660x: remove enum clock_config_register_bits")
>      518d38423b48 ("staging: comedi: ni_660x: tidy up ni_660x_select_pfi_output()")
>      9678b73e273a ("staging: comedi: ni_660x: tidy up ni_660x_write_register()")
>      aa94f2888825 ("staging: comedi: ni_660x: tidy up ni_660x_set_pfi_routing()")
>      ad98c18cb9de ("staging: comedi: ni_660x: tidy up ni_660x_read_register()")
>      cded944fa90c ("staging: comedi: ni_660x: Prefer kernel type 'u64' over 'uint64_t'")
>      fecf4cce0021 ("staging: comedi: ni_660x: cleanup the NI660X_DMA_CFG register helpers")
> 
> 
> How should we proceed with this patch?

Hi Sasha, the bug was introduced in v4.7 and hasn't been backported to 
any earlier stable kernels, so no need to do anything for v4.4.x or v3.18.x.

-- 
-=( Ian Abbott <abbotti@mev.co.uk> || Web: www.mev.co.uk )=-
-=( MEV Ltd. is a company registered in England & Wales. )=-
-=( Registered number: 02862268.  Registered address:    )=-
-=( 15 West Park Road, Bramhall, STOCKPORT, SK7 3JZ, UK. )=-

Re: [PATCH] staging: comedi: ni_660x: fix missing break in switch statement

[Gustavo A. R. Silva]

Hi Sasha,

On 2/18/19 3:14 PM, Sasha Levin wrote:
> Hi,
> 
> [This is an automated email]
> 
> This commit has been processed because it contains a "Fixes:" tag,
> fixing commit: 58dd7c0a2a6e Staging: comedi: add ni_660x driver.
> 
> The bot has tested the following trees: v4.20.8, v4.19.21, v4.14.99, v4.9.156, v4.4.174, v3.18.134.
> 
> v4.20.8: Build OK!
> v4.19.21: Build OK!
> v4.14.99: Build OK!
> v4.9.156: Build OK!
> v4.4.174: Failed to apply! Possible dependencies:
>     01ead0ded315 ("staging: comedi: ni_660x: cleanup the NI660X_IO_CFG register helpers")
>     22acd860137a ("staging: comedi: ni_660x: change IOConfigReg() into a macro")
>     41014593caeb ("staging: comedi: ni_660x: cleanup the NI660X_GLOBAL_INT_{STATUS, CFG}")
>     502552e161ae ("staging: comedi: ni_660x: remove enum clock_config_register_bits")
>     518d38423b48 ("staging: comedi: ni_660x: tidy up ni_660x_select_pfi_output()")
>     9678b73e273a ("staging: comedi: ni_660x: tidy up ni_660x_write_register()")
>     aa94f2888825 ("staging: comedi: ni_660x: tidy up ni_660x_set_pfi_routing()")
>     ad98c18cb9de ("staging: comedi: ni_660x: tidy up ni_660x_read_register()")
>     cded944fa90c ("staging: comedi: ni_660x: Prefer kernel type 'u64' over 'uint64_t'")
>     fecf4cce0021 ("staging: comedi: ni_660x: cleanup the NI660X_DMA_CFG register helpers")
> 
> v3.18.134: Failed to apply! Possible dependencies:
>     01ead0ded315 ("staging: comedi: ni_660x: cleanup the NI660X_IO_CFG register helpers")
>     22acd860137a ("staging: comedi: ni_660x: change IOConfigReg() into a macro")
>     41014593caeb ("staging: comedi: ni_660x: cleanup the NI660X_GLOBAL_INT_{STATUS, CFG}")
>     502552e161ae ("staging: comedi: ni_660x: remove enum clock_config_register_bits")
>     518d38423b48 ("staging: comedi: ni_660x: tidy up ni_660x_select_pfi_output()")
>     9678b73e273a ("staging: comedi: ni_660x: tidy up ni_660x_write_register()")
>     aa94f2888825 ("staging: comedi: ni_660x: tidy up ni_660x_set_pfi_routing()")
>     ad98c18cb9de ("staging: comedi: ni_660x: tidy up ni_660x_read_register()")
>     cded944fa90c ("staging: comedi: ni_660x: Prefer kernel type 'u64' over 'uint64_t'")
>     fecf4cce0021 ("staging: comedi: ni_660x: cleanup the NI660X_DMA_CFG register helpers")
> 
> 
> How should we proceed with this patch?
> 

Ian commented that this bug was introduced in 4.7, so it should be applied to 4.9 ... 4.20

Thanks
--
Gustavo