src: avoid IPPROTO_MAX for array definitions
Florian Westphal
maintainerPATCH 1/1 src: avoid IPPROTO_MAX for array definitions
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).
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.
--- include/rule.h | 2 +- src/exthdr.c | 5 ++--- src/rule.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)
include/rule.h +1 -1
@@ -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 */
src/exthdr.c +2 -3
@@ -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;
src/rule.c +1 -1
@@ -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,
Signature · 1 line
2.39.3
Pablo Neira Ayuso
maintainerQuoted 3 lines · Florian Westphal
ip header can only accomodate 8but value, but
IPPROTO_MAXhas 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.
Quoted 66 lines
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 <[email protected]>--- include/rule.h | 2 +- src/exthdr.c | 5 ++--- src/rule.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)include/rule.h +1
-1@@ -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 */ src/exthdr.c +2
-3@@ -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;src/rule.c +1
-1@@ -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,Signature · 1 line
2.39.3
Florian Westphal
maintainerQuoted 6 lines · Pablo Neira Ayuso
Quoted 3 lines · Florian Westphal
ip header can only accomodate 8but value, but
IPPROTO_MAXhas 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.
If you don't like UINT8_MAX+1, would you be fine with open-coding, i.e.
[256] ?
Pablo Neira Ayuso
maintainerQuoted 10 lines · Florian Westphal
Quoted 6 lines · Pablo Neira Ayuso
Quoted 3 lines · Florian Westphal
ip header can only accomodate 8but value, but
IPPROTO_MAXhas 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.If you don't like UINT8_MAX+1, would you be fine with open-coding, i.e.
[256] ?
UINT8_MAX+1 is OK with me