Skip to contentSkip to conversation

sctp: Fix fall-through warnings for Clang

PATCH RESEND Superseded Gustavo A. R. Silva 3 participants 4 messages Mar 5, 2021 – May 18, 2021

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 sctp: Fix fall-through warnings for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix a couple of warnings by explicitly adding a break statement and replacing a comment with a goto statement instead of letting the code fall through to the next case.

---
 net/sctp/input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/sctp/input.c +2 -1
index d508f6f3dd08..5ceaf75105ba 100644
@@ -633,7 +633,7 @@ int sctp_v4_err(struct sk_buff *skb, __u32 info)
 		break;
 	case ICMP_REDIRECT:
 		sctp_icmp_redirect(sk, transport, skb);
-		/* Fall through to out_unlock. */
+		goto out_unlock;
 	default:
 		goto out_unlock;
 	}
@@ -1236,6 +1236,7 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net,
 						net, ch, laddr,
 						sctp_hdr(skb)->source,
 						transportp);
+			break;
 		default:
 			break;
 		}
Signature · 1 line
2.27.0
#1 lore raw

Hi all,

Friendly ping: who can take this, please?

Thanks
--
Gustavo

Quoted 33 lines · Gustavo A. R. Silva

In preparation to enable -Wimplicit-fallthrough for Clang, fix a couple of warnings by explicitly adding a break statement and replacing a comment with a goto statement instead of letting the code fall through to the next case.

---
 net/sctp/input.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/sctp/input.c +2 -1
index d508f6f3dd08..5ceaf75105ba 100644
@@ -633,7 +633,7 @@ int sctp_v4_err(struct sk_buff *skb, __u32 info)
 		break;
 	case ICMP_REDIRECT:
 		sctp_icmp_redirect(sk, transport, skb);
-		/* Fall through to out_unlock. */
+		goto out_unlock;
 	default:
 		goto out_unlock;
 	}
@@ -1236,6 +1236,7 @@ static struct sctp_association *__sctp_rcv_walk_lookup(struct net *net,
 						net, ch, laddr,
 						sctp_hdr(skb)->source,
 						transportp);
+			break;
 		default:
 			break;
 		}
#2 lore raw
Quoted 3 lines · Gustavo A. R. Silva

Hi all,

Friendly ping: who can take this, please?

It would go via net/net-next tree, but I can't find this one on patchwork. Just the previous version.

http://patchwork.ozlabs.org/project/netdev/list/?series=&submitter=&state=*&q=sctp%3A+Fix+fall-through+warnings+for+Clang&archive=both&delegate=

I can, however, find it in the archives.

https://lore.kernel.org/netdev/20210305090717.GA139387%40embeddedor/T/

Dave and Jakub will know better.

Marcelo

#3 lore raw

Thanks, Marcelo.

I'm taking this in my -next[1] branch for v5.14.

Thanks
--
Gustavo

[1] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/log/?h=for-next/kspp

Quoted 18 lines · Marcelo Ricardo Leitner
Quoted 3 lines · Gustavo A. R. Silva

Hi all,

Friendly ping: who can take this, please?

It would go via net/net-next tree, but I can't find this one on patchwork. Just the previous version.

http://patchwork.ozlabs.org/project/netdev/list/?series=&submitter=&state=*&q=sctp%3A+Fix+fall-through+warnings+for+Clang&archive=both&delegate=

I can, however, find it in the archives.

https://lore.kernel.org/netdev/20210305090717.GA139387%40embeddedor/T/

Dave and Jakub will know better.

Marcelo