netfilter: Use fallthrough pseudo-keyword

Replace the existing /* fall through */ comments and its variants with
the new pseudo-keyword macro fallthrough[1]. Also, remove unnecessary
fall-through markings when it is the case.

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index c83ffe9121639ce4c608afcd4c05089e759b7d7d..38e946fdd0417a948da5334bcc4cb7aede286e58 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1935,7 +1935,7 @@ static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt,
                        size_kern = match_size;
                module_put(match->me);
                break;
-       case EBT_COMPAT_WATCHER: /* fallthrough */
+       case EBT_COMPAT_WATCHER:
        case EBT_COMPAT_TARGET:
                wt = xt_request_find_target(NFPROTO_BRIDGE, name,
                                            mwt->u.revision);

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 56621d6bfd2974ea8e7f723c569cb4c505e3912a..920b7c4331f0c3da9ee44a670db045f7e9424465 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -1644,7 +1644,7 @@ dump_last:
                                goto next_set;
                        if (set->variant->uref)
                                set->variant->uref(set, cb, true);
-                       /* fall through */
+                       fallthrough;
                default:
                        ret = set->variant->list(set, skb, cb);
                        if (!cb->args[IPSET_CB_ARG0])

diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c
index 573cb44814813985c61afbedf582a618312e8e1a..e697a824b0018e1f1e26e3d547c1e80c6ca49e39 100644 (file)
--- a/net/netfilter/nf_conntrack_h323_asn1.c
+++ b/net/netfilter/nf_conntrack_h323_asn1.c
@@ -257,15 +257,15 @@ static unsigned int get_uint(struct bitstr *bs, int b)
        case 4:
                v |= *bs->cur++;
                v <<= 8;
-               /* fall through */
+               fallthrough;
        case 3:
                v |= *bs->cur++;
                v <<= 8;
-               /* fall through */
+               fallthrough;
        case 2:
                v |= *bs->cur++;
                v <<= 8;
-               /* fall through */
+               fallthrough;
        case 1:
                v |= *bs->cur++;
                break;

diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index a0560d175a7ffc88750e1d8ddaf531782db52147..95f79980348c836b0e2a6813d13a4ef81189be78 100644 (file)
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -610,7 +610,7 @@ void nf_ct_netns_put(struct net *net, uint8_t nfproto)
        switch (nfproto) {
        case NFPROTO_BRIDGE:
                nf_ct_netns_do_put(net, NFPROTO_BRIDGE);
-               /* fall through */
+               fallthrough;
        case NFPROTO_INET:
                nf_ct_netns_do_put(net, NFPROTO_IPV4);
                nf_ct_netns_do_put(net, NFPROTO_IPV6);

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index 1926fd56df56ab00e312acf9c9a3fbe25369690e..6892e497781c12235350ce1f6e3f9d573d6d4ba4 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -900,7 +900,7 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct,
                                return -NF_REPEAT;
                        return NF_DROP;
                }
-               /* Fall through */
+               fallthrough;
        case TCP_CONNTRACK_IGNORE:
                /* Ignored packets:
                 *

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 6a26299cb0640b5dd6a31e52e721b5c4a0c26142..a604f43e3e6bdbedfaee43bb1a70b02e2a1725e8 100644 (file)
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -60,7 +60,7 @@ print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,
                           ntohs(tuple->src.u.tcp.port),
                           ntohs(tuple->dst.u.tcp.port));
                break;
-       case IPPROTO_UDPLITE: /* fallthrough */
+       case IPPROTO_UDPLITE:
        case IPPROTO_UDP:
                seq_printf(s, "sport=%hu dport=%hu ",
                           ntohs(tuple->src.u.udp.port),

diff --git a/net/netfilter/nf_nat_core.c b/net/netfilter/nf_nat_core.c
index bfc555fcbc7291a4f72a473ae563f09a90fa5e35..ea923f8cf9c4258bf0288169a6ecac73f039c25c 100644 (file)
--- a/net/netfilter/nf_nat_core.c
+++ b/net/netfilter/nf_nat_core.c
@@ -408,7 +408,7 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,
        static const unsigned int max_attempts = 128;
 
        switch (tuple->dst.protonum) {
-       case IPPROTO_ICMP: /* fallthrough */
+       case IPPROTO_ICMP:
        case IPPROTO_ICMPV6:
                /* id is same for either direction... */
                keyptr = &tuple->src.u.icmp.id;
@@ -442,11 +442,11 @@ static void nf_nat_l4proto_unique_tuple(struct nf_conntrack_tuple *tuple,
                }
                goto find_free_id;
 #endif
-       case IPPROTO_UDP:       /* fallthrough */
-       case IPPROTO_UDPLITE:   /* fallthrough */
-       case IPPROTO_TCP:       /* fallthrough */
-       case IPPROTO_SCTP:      /* fallthrough */
-       case IPPROTO_DCCP:      /* fallthrough */
+       case IPPROTO_UDP:
+       case IPPROTO_UDPLITE:
+       case IPPROTO_TCP:
+       case IPPROTO_SCTP:
+       case IPPROTO_DCCP:
                if (maniptype == NF_NAT_MANIP_SRC)
                        keyptr = &tuple->src.u.all;
                else

diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index ebcdc8e5447677ad82ee2d41668c9d2325a3c242..9cca35d22927382e0323cc7cb8cd16913e8d3e87 100644 (file)
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -704,8 +704,7 @@ ipv4_synproxy_hook(void *priv, struct sk_buff *skb,
                nf_ct_seqadj_init(ct, ctinfo, 0);
                synproxy->tsoff = 0;
                this_cpu_inc(snet->stats->conn_reopened);
-
-               /* fall through */
+               fallthrough;
        case TCP_CONNTRACK_SYN_SENT:
                if (!synproxy_parse_options(skb, thoff, th, &opts))
                        return NF_DROP;
@@ -1128,8 +1127,7 @@ ipv6_synproxy_hook(void *priv, struct sk_buff *skb,
                nf_ct_seqadj_init(ct, ctinfo, 0);
                synproxy->tsoff = 0;
                this_cpu_inc(snet->stats->conn_reopened);
-
-               /* fall through */
+               fallthrough;
        case TCP_CONNTRACK_SYN_SENT:
                if (!synproxy_parse_options(skb, thoff, th, &opts))
                        return NF_DROP;

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 6708a4f2eec8efbb03720791737574961cf5bfb8..0d96e4eb754db7a6bf5596a0bf09d94e954043b1 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -4375,7 +4375,7 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,
        case NFT_TRANS_ABORT:
        case NFT_TRANS_RELEASE:
                set->use--;
-               /* fall through */
+               fallthrough;
        default:
                nf_tables_unbind_set(ctx, set, binding,
                                     phase == NFT_TRANS_COMMIT);
@@ -6256,7 +6256,7 @@ void nf_tables_deactivate_flowtable(const struct nft_ctx *ctx,
        case NFT_TRANS_ABORT:
        case NFT_TRANS_RELEASE:
                flowtable->use--;
-               /* fall through */
+               fallthrough;
        default:
                return;
        }
@@ -7262,7 +7262,7 @@ static int nf_tables_validate(struct net *net)
                break;
        case NFT_VALIDATE_NEED:
                nft_validate_state_update(net, NFT_VALIDATE_DO);
-               /* fall through */
+               fallthrough;
        case NFT_VALIDATE_DO:
                list_for_each_entry(table, &net->nft.tables, list) {
                        if (nft_table_validate(net, table) < 0)
@@ -8336,7 +8336,7 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
                default:
                        return -EINVAL;
                }
-               /* fall through */
+               fallthrough;
        case NFT_CONTINUE:
        case NFT_BREAK:
        case NFT_RETURN:

diff --git a/net/netfilter/nf_tables_core.c b/net/netfilter/nf_tables_core.c
index 96c74c4c7176283c472b5f3ed6abf81eaf81c27d..587897a2498b87dee5fa0f54be1e66bb0510c48c 100644 (file)
--- a/net/netfilter/nf_tables_core.c
+++ b/net/netfilter/nf_tables_core.c
@@ -213,7 +213,7 @@ next_rule:
                jumpstack[stackptr].chain = chain;
                jumpstack[stackptr].rules = rules + 1;
                stackptr++;
-               /* fall through */
+               fallthrough;
        case NFT_GOTO:
                nft_trace_packet(&info, chain, rule,
                                 NFT_TRACETYPE_RULE);

diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
index da915c224a82d8fd09820d590d593a7e528fedd2..89a381f7f94597adeb503a8ef1acf458505b4532 100644 (file)
--- a/net/netfilter/nfnetlink_cttimeout.c
+++ b/net/netfilter/nfnetlink_cttimeout.c
@@ -451,7 +451,7 @@ static int cttimeout_default_get(struct net *net, struct sock *ctnl,
        case IPPROTO_TCP:
                timeouts = nf_tcp_pernet(net)->timeouts;
                break;
-       case IPPROTO_UDP: /* fallthrough */
+       case IPPROTO_UDP:
        case IPPROTO_UDPLITE:
                timeouts = nf_udp_pernet(net)->timeouts;
                break;

diff --git a/net/netfilter/nft_cmp.c b/net/netfilter/nft_cmp.c
index 8a28c127effc22e3caedb34f0583f845f6b40a07..16f4d84599ac79f9db5703ca6a9a7a18f73f1ffc 100644 (file)
--- a/net/netfilter/nft_cmp.c
+++ b/net/netfilter/nft_cmp.c
@@ -43,7 +43,7 @@ void nft_cmp_eval(const struct nft_expr *expr,
        case NFT_CMP_LT:
                if (d == 0)
                        goto mismatch;
-               /* fall through */
+               fallthrough;
        case NFT_CMP_LTE:
                if (d > 0)
                        goto mismatch;
@@ -51,7 +51,7 @@ void nft_cmp_eval(const struct nft_expr *expr,
        case NFT_CMP_GT:
                if (d == 0)
                        goto mismatch;
-               /* fall through */
+               fallthrough;
        case NFT_CMP_GTE:
                if (d < 0)
                        goto mismatch;

diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index 77258af1fce01b5ae4fba5c2d339650bca867536..322bd674963ee009fcc01f56e6f3b50e248031f6 100644 (file)
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -129,7 +129,7 @@ static void nft_ct_get_eval(const struct nft_expr *expr,
                return;
        }
 #endif
-       case NFT_CT_BYTES: /* fallthrough */
+       case NFT_CT_BYTES:
        case NFT_CT_PKTS: {
                const struct nf_conn_acct *acct = nf_conn_acct_find(ct);
                u64 count = 0;
@@ -1013,8 +1013,8 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,
                help6 = nf_conntrack_helper_try_module_get(name, family,
                                                           priv->l4proto);
                break;
-       case NFPROTO_NETDEV: /* fallthrough */
-       case NFPROTO_BRIDGE: /* same */
+       case NFPROTO_NETDEV:
+       case NFPROTO_BRIDGE:
        case NFPROTO_INET:
                help4 = nf_conntrack_helper_try_module_get(name, NFPROTO_IPV4,
                                                           priv->l4proto);

diff --git a/net/netfilter/nft_fib.c b/net/netfilter/nft_fib.c
index cfac0964f48db4e2d23b350904ab01c70553a339..4dfdaeaf09a5bf7cc4a70910398bc5dce7a1580e 100644 (file)
--- a/net/netfilter/nft_fib.c
+++ b/net/netfilter/nft_fib.c
@@ -32,7 +32,7 @@ int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr,
        unsigned int hooks;
 
        switch (priv->result) {
-       case NFT_FIB_RESULT_OIF: /* fallthrough */
+       case NFT_FIB_RESULT_OIF:
        case NFT_FIB_RESULT_OIFNAME:
                hooks = (1 << NF_INET_PRE_ROUTING);
                break;

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index a7de3a58f553d57885876ba730b5ab2877422101..ed7cb9f747f60fd624d2ddc814bb59d68ea4cc6a 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -467,7 +467,7 @@ static int nft_payload_l4csum_offset(const struct nft_pktinfo *pkt,
        case IPPROTO_UDP:
                if (!nft_payload_udp_checksum(skb, pkt->xt.thoff))
                        return -1;
-               /* Fall through. */
+               fallthrough;
        case IPPROTO_UDPLITE:
                *l4csum_offset = offsetof(struct udphdr, check);
                break;

diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c
index 51b454d8fa9c97252721f3f3d8e288c0b84b8e8a..cedf47ab3c6f98d13f0397e27a4beeca44d28854 100644 (file)
--- a/net/netfilter/utils.c
+++ b/net/netfilter/utils.c
@@ -25,7 +25,7 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                if (protocol != IPPROTO_TCP && protocol != IPPROTO_UDP)
                        skb->csum = 0;
@@ -51,7 +51,7 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
        case CHECKSUM_COMPLETE:
                if (len == skb->len - dataoff)
                        return nf_ip_checksum(skb, hook, dataoff, protocol);
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr, protocol,
                                               skb->len - dataoff, 0);
@@ -79,7 +79,7 @@ __sum16 nf_ip6_checksum(struct sk_buff *skb, unsigned int hook,
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
                        break;
                }
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                skb->csum = ~csum_unfold(
                                csum_ipv6_magic(&ip6h->saddr, &ip6h->daddr,
@@ -106,7 +106,7 @@ static __sum16 nf_ip6_checksum_partial(struct sk_buff *skb, unsigned int hook,
        case CHECKSUM_COMPLETE:
                if (len == skb->len - dataoff)
                        return nf_ip6_checksum(skb, hook, dataoff, protocol);
-               /* fall through */
+               fallthrough;
        case CHECKSUM_NONE:
                hsum = skb_checksum(skb, 0, dataoff, 0);
                skb->csum = ~csum_unfold(csum_ipv6_magic(&ip6h->saddr,

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 99a468be4a59fb1995c91d8400b0cc2bf987623a..8b2daccaf8dfe1e71a95ba51181322120fc21232 100644 (file)
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1571,7 +1571,7 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos,
                trav->curr = trav->curr->next;
                if (trav->curr != trav->head)
                        break;
-               /* fall through */
+               fallthrough;
        default:
                return NULL;
        }