staging: comedi: ni_660x: fix missing break in switch statement

PATCH Superseded Gustavo A. R. Silva 2 participants 4 messages Feb 12, 2019 – Feb 18, 2019 2 messages not in the archive

Subsystems (2)

Stable branch Staging

lore

Share & tools

lore

Gustavo A. R. Silva

author

2019-02-12 18:08 UTC #0 lore raw

PATCH 1/1 staging: comedi: ni_660x: fix missing break in switch statement

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 [email protected]

Signed-off-by Gustavo A. R. Silva <[email protected]>

---
 drivers/staging/comedi/drivers/ni_660x.c | 1 +
 1 file changed, 1 insertion(+)

drivers/staging/comedi/drivers/ni_660x.c +1 -0

index e70a461e723f..405573e927cf 100644
@@ -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;
 	}

Signature · 1 line

2.20.1

Gustavo A. R. Silva

author

2019-02-12 18:46 UTC #1 lore raw

Hi,

Please, drop this.

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

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

Thanks
--
Gustavo

Quoted 26 lines · 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 [email protected]
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/staging/comedi/drivers/ni_660x.c | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/comedi/drivers/ni_660x.c +1 -0
index e70a461e723f..405573e927cf 100644
@@ -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;
 	}

A message that is not in the archive (sent off-list or not yet received): [email protected]

Ian Abbott

2019-02-15 17:50 UTC #3 lore raw

Quoted 38 lines · Sasha Levin

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")

Quoted 1 line

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.

Signature · 4 lines

-=( Ian Abbott <[email protected]> || 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. )=-

A message that is not in the archive (sent off-list or not yet received): [email protected]

Gustavo A. R. Silva

author

2019-02-18 21:19 UTC #5 lore raw

Hi Sasha,

Quoted 38 lines · Sasha Levin

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")

Quoted 2 lines

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