2021-05-28 20:05:51

by Gustavo A. R. Silva

Subject: [PATCH v2][next] floppy: Fix fall-through warning for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
by explicitly adding a break statement instead of letting the code fall
through to the next case.

Link: https://github.com/KSPP/linux/issues/115
Link: https://lore.kernel.org/linux-hardening/[email protected]/
Suggested-by: Jens Axboe <[email protected]>
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
Changes in v2:
- Add a break statement instead of fallthrough;

drivers/block/floppy.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 8a9d22207c59..803af2a72520 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -2123,6 +2123,7 @@ static void format_interrupt(void)
switch (interpret_errors()) {
case 1:
cont->error();
+ break;
case 2:
break;
case 0:
--
2.27.0

2021-05-29 06:37:42

by Denis Efremov

Subject: Re: [PATCH v2][next] floppy: Fix fall-through warning for Clang

Hi,

On 5/28/21 11:03 PM, Gustavo A. R. Silva wrote:
> In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
> by explicitly adding a break statement instead of letting the code fall
> through to the next case.
>
> Link: https://github.com/KSPP/linux/issues/115
> Link: https://lore.kernel.org/linux-hardening/[email protected]/
> Suggested-by: Jens Axboe <[email protected]>
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Applied, thanks!
https://github.com/evdenis/linux-floppy/commit/6eaddb2a2aa3acd0660537f9f6a12785be0ae830

I will send it to Jens with other floppy patches.
It will be in 5.14

Regards,
Denis

> ---
> Changes in v2:
> - Add a break statement instead of fallthrough;
>
> drivers/block/floppy.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
> index 8a9d22207c59..803af2a72520 100644
> --- a/drivers/block/floppy.c
> +++ b/drivers/block/floppy.c
> @@ -2123,6 +2123,7 @@ static void format_interrupt(void)
> switch (interpret_errors()) {
> case 1:
> cont->error();
> + break;
> case 2:
> break;
> case 0:
>

2021-06-04 03:06:49

by Gustavo A. R. Silva

Subject: Re: [PATCH v2][next] floppy: Fix fall-through warning for Clang

On 5/29/21 01:37, Denis Efremov wrote:
> Hi,
>
> On 5/28/21 11:03 PM, Gustavo A. R. Silva wrote:
>> In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
>> by explicitly adding a break statement instead of letting the code fall
>> through to the next case.
>>
>> Link: https://github.com/KSPP/linux/issues/115
>> Link: https://lore.kernel.org/linux-hardening/[email protected]/
>> Suggested-by: Jens Axboe <[email protected]>
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> Applied, thanks!
> https://github.com/evdenis/linux-floppy/commit/6eaddb2a2aa3acd0660537f9f6a12785be0ae830
>
> I will send it to Jens with other floppy patches.
> It will be in 5.14

Awesome. :)

Thanks, Denis.
--
Gustavo