2020-09-28 09:03:23

by He Zhe

Subject: [PATCH] powerpc: net: bpf_jit_comp: Fix misuse of fallthrough

From: He Zhe <[email protected]>

The user defined label following "fallthrough" is not considered by GCC
and causes build failure.

kernel-source/include/linux/compiler_attributes.h:208:41: error: attribute
'fallthrough' not preceding a case label or default label [-Werror]
208 define fallthrough _attribute((fallthrough_))
^~~~~~~~~~~~~

Signed-off-by: He Zhe <[email protected]>
---
arch/powerpc/net/bpf_jit_comp.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c
index 78d61f97371e..e809cb5a1631 100644
--- a/arch/powerpc/net/bpf_jit_comp.c
+++ b/arch/powerpc/net/bpf_jit_comp.c
@@ -475,7 +475,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image,
case BPF_JMP | BPF_JSET | BPF_K:
case BPF_JMP | BPF_JSET | BPF_X:
true_cond = COND_NE;
- fallthrough;
cond_branch:
/* same targets, can avoid doing the test :) */
if (filter[i].jt == filter[i].jf) {
--
2.26.2

2020-09-29 14:46:47

by Daniel Borkmann

Subject: Re: [PATCH] powerpc: net: bpf_jit_comp: Fix misuse of fallthrough

On 9/28/20 11:00 AM, [email protected] wrote:
> From: He Zhe <[email protected]>
>
> The user defined label following "fallthrough" is not considered by GCC
> and causes build failure.
>
> kernel-source/include/linux/compiler_attributes.h:208:41: error: attribute
> 'fallthrough' not preceding a case label or default label [-Werror]
> 208 define fallthrough _attribute((fallthrough_))
> ^~~~~~~~~~~~~
>
> Signed-off-by: He Zhe <[email protected]>

Applied, thanks! I've also added Fixes tag with df561f6688fe ("treewide: Use fallthrough pseudo-keyword")
which added the bug.