From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1166EB64D7 for ; Tue, 20 Jun 2023 22:32:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbjFTWco (ORCPT ); Tue, 20 Jun 2023 18:32:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbjFTWco (ORCPT ); Tue, 20 Jun 2023 18:32:44 -0400 Received: from mail.netfilter.org (mail.netfilter.org [217.70.188.207]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 73887DC for ; Tue, 20 Jun 2023 15:32:41 -0700 (PDT) Date: Wed, 21 Jun 2023 00:32:37 +0200 From: Pablo Neira Ayuso To: Florian Westphal Cc: netfilter-devel@vger.kernel.org Subject: Re: [PATCH nft] src: avoid IPPROTO_MAX for array definitions Message-ID: References: <20230620200836.22041-1-fw@strlen.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230620200836.22041-1-fw@strlen.de> Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Tue, Jun 20, 2023 at 10:08:36PM +0200, Florian Westphal wrote: > ip header can only accomodate 8but value, but IPPROTO_MAX has been bumped > due to uapi reasons to support MPTCP (262, which is used to toggle on > multipath support in tcp). Maybe use IPPROTO_RAW + 1, hopefully that won't ever change. > This results in: > exthdr.c:349:11: warning: result of comparison of constant 263 with expression of type 'uint8_t' (aka 'unsigned char') is always true [-Wtautological-constant-out-of-range-compare] > if (type < array_size(exthdr_protocols)) > ~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > redude array sizes back to what can be used on-wire. > > Signed-off-by: Florian Westphal > --- > include/rule.h | 2 +- > src/exthdr.c | 5 ++--- > src/rule.c | 2 +- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/include/rule.h b/include/rule.h > index b360e2614c78..5cb549c2e14e 100644 > --- a/include/rule.h > +++ b/include/rule.h > @@ -786,7 +786,7 @@ struct timeout_protocol { > uint32_t *dflt_timeout; > }; > > -extern struct timeout_protocol timeout_protocol[IPPROTO_MAX]; > +extern struct timeout_protocol timeout_protocol[UINT8_MAX + 1]; > extern int timeout_str2num(uint16_t l4proto, struct timeout_state *ts); > > #endif /* NFTABLES_RULE_H */ > diff --git a/src/exthdr.c b/src/exthdr.c > index d0274bea6ca0..f5527ddb4a3f 100644 > --- a/src/exthdr.c > +++ b/src/exthdr.c > @@ -289,7 +289,7 @@ struct stmt *exthdr_stmt_alloc(const struct location *loc, > return stmt; > } > > -static const struct exthdr_desc *exthdr_protocols[IPPROTO_MAX] = { > +static const struct exthdr_desc *exthdr_protocols[UINT8_MAX + 1] = { > [IPPROTO_HOPOPTS] = &exthdr_hbh, > [IPPROTO_ROUTING] = &exthdr_rt, > [IPPROTO_FRAGMENT] = &exthdr_frag, > @@ -346,8 +346,7 @@ void exthdr_init_raw(struct expr *expr, uint8_t type, > expr->exthdr.offset = offset; > expr->exthdr.desc = NULL; > > - if (type < array_size(exthdr_protocols)) > - expr->exthdr.desc = exthdr_protocols[type]; > + expr->exthdr.desc = exthdr_protocols[type]; > > if (expr->exthdr.desc == NULL) > goto out; > diff --git a/src/rule.c b/src/rule.c > index 3704600a87be..19d681bb74b3 100644 > --- a/src/rule.c > +++ b/src/rule.c > @@ -76,7 +76,7 @@ static uint32_t udp_dflt_timeout[] = { > [NFTNL_CTTIMEOUT_UDP_REPLIED] = 120, > }; > > -struct timeout_protocol timeout_protocol[IPPROTO_MAX] = { > +struct timeout_protocol timeout_protocol[UINT8_MAX + 1] = { > [IPPROTO_TCP] = { > .array_size = NFTNL_CTTIMEOUT_TCP_MAX, > .state_to_name = tcp_state_to_name, > -- > 2.39.3 >