net: flow_dissector: fix tcp flags dissection on big-endian
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/1 net: flow_dissector: fix tcp flags dissection on big-endian
net/netfilter/nf_flow_table_offload.c: In function 'nf_flow_rule_match':
net/netfilter/nf_flow_table_offload.c:80:21: warning: unsigned conversion from 'int' to '__be16' {aka 'short unsigned int'} changes value from '327680' to '0' [-Woverflow]
80 | mask->tcp.flags = TCP_FLAG_RST | TCP_FLAG_FIN;
| ^~~~~~~~~~~~
---
@Geert: I have removed the pad field and included the nitpick fix on the
comment, given I have slightly updated this patch, I would prefer if you can provide a fresh Reviewed-by tag. Thanks.
include/net/flow_dissector.h | 8 ++++++-- net/core/flow_dissector.c | 2 +- net/netfilter/nf_flow_table_offload.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-)
include/net/flow_dissector.h +6 -2
@@ -189,10 +189,14 @@ struct flow_dissector_key_eth_addrs {/** * struct flow_dissector_key_tcp: -* @flags: flags +* @flags: TCP flags, including the initial Data offset field bits (16-bits) +* @flag_word: Data offset + reserved bits + TCP flags + window (32-bits) */ struct flow_dissector_key_tcp { -__be16 flags; +union { +__be16 flags; +__be32 flag_word; + }; };/**
net/core/flow_dissector.c +1 -1
@@ -756,7 +756,7 @@ __skb_flow_dissect_tcp(const struct sk_buff *skb, key_tcp =skb_flow_dissector_target (flow_dissector,FLOW_DISSECTOR_KEY_TCP , target_container); - key_tcp->flags = (*(__be16 *) &tcp_flag_word (th) &htons (0x0FFF )); + key_tcp->flag_word =tcp_flag_word (th); } static void
net/netfilter/nf_flow_table_offload.c +2 -2
@@ -87,8 +87,8 @@ static int nf_flow_rule_match(struct nf_flow_match *match,switch (tuple->l4proto) {case IPPROTO_TCP : - key->tcp.flags =0 ; - mask->tcp.flags =TCP_FLAG_RST |TCP_FLAG_FIN ; + key->tcp.flag_word =0 ; + mask->tcp.flag_word =TCP_FLAG_RST |TCP_FLAG_FIN ; match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_TCP );break ;case IPPROTO_UDP :
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerHi,
Please, withdraw this patch.
I can fix this by using TCPHDR_* definitions.
Thanks.
Quoted 71 lines · Pablo Neira Ayuso
net/netfilter/nf_flow_table_offload.c: In function 'nf_flow_rule_match':
net/netfilter/nf_flow_table_offload.c:80:21: warning: unsigned conversion from 'int' to '__be16' {aka 'short unsigned int'} changes value from '327680' to '0' [-Woverflow]
80 |mask->tcp.flags=TCP_FLAG_RST|TCP_FLAG_FIN;
| ^~~~~~~~~~~~Fixes ac4bb5de2701 ("net: flow_dissector: add support for dissection of tcp flags")Fixes c29f74e0df7a ("netfilter: nf_flow_table: hardware offload support")Reported-by Stephen Rothwell <[email protected]>Signed-off-by Pablo Neira Ayuso <[email protected]>---
@Geert: I have removed the pad field and included the nitpick fix on the
comment, given I have slightly updated this patch, I would prefer if you can provide a fresh Reviewed-by tag. Thanks.include/net/flow_dissector.h | 8 ++++++-- net/core/flow_dissector.c | 2 +- net/netfilter/nf_flow_table_offload.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-)include/net/flow_dissector.h +6
-2@@ -189,10 +189,14 @@ struct flow_dissector_key_eth_addrs {/** * struct flow_dissector_key_tcp: -* @flags: flags +* @flags: TCP flags, including the initial Data offset field bits (16-bits) +* @flag_word: Data offset + reserved bits + TCP flags + window (32-bits) */ struct flow_dissector_key_tcp { -__be16 flags; +union { +__be16 flags; +__be32 flag_word; + }; };/** net/core/flow_dissector.c +1
-1@@ -756,7 +756,7 @@ __skb_flow_dissect_tcp(const struct sk_buff *skb, key_tcp =skb_flow_dissector_target (flow_dissector,FLOW_DISSECTOR_KEY_TCP , target_container); - key_tcp->flags = (*(__be16 *) &tcp_flag_word (th) &htons (0x0FFF )); + key_tcp->flag_word =tcp_flag_word (th); } static voidnet/netfilter/nf_flow_table_offload.c +2
-2@@ -87,8 +87,8 @@ static int nf_flow_rule_match(struct nf_flow_match *match,switch (tuple->l4proto) {case IPPROTO_TCP : - key->tcp.flags =0 ; - mask->tcp.flags =TCP_FLAG_RST |TCP_FLAG_FIN ; + key->tcp.flag_word =0 ; + mask->tcp.flag_word =TCP_FLAG_RST |TCP_FLAG_FIN ; match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_TCP );break ;case IPPROTO_UDP :Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerQuoted 5 lines · Pablo Neira Ayuso
Hi,
Please, withdraw this patch.
I can fix this by using TCPHDR_* definitions.
Oh actually, that's only true for my nf_flow_table_offload code.
But not for the flow dissector code, which is using tcp_flag_word().
I will revamp and send v2.