netfilter: nft_payload: use __b16 to store gre version
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nft_payload: use __b16 to store gre version
GRE_VERSION and GRE_VERSION0 are expressed in network byte order, use __be16. Uncovered by sparse:
net/netfilter/nft_payload.c:112:25: warning: incorrect type in assignment (different base types)net/netfilter/nft_payload.c:112:25: expected unsigned int [usertype] versionnet/netfilter/nft_payload.c:112:25: got restricted __be16net/netfilter/nft_payload.c:114:22: warning: restricted __be16 degrades to integer
Fixes c247897d7c19 ("netfilter: nft_payload: access GRE payload via inner offset")
Reported-by Jakub Kicinski <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nft_payload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_payload.c +2 -1
@@ -102,8 +102,9 @@ static int __nft_payload_inner_offset(struct nft_pktinfo *pkt) }break ;case IPPROTO_GRE : { -u32 offset =sizeof (struct gre_base_hdr ), version; +u32 offset =sizeof (struct gre_base_hdr );struct gre_base_hdr *gre, _gre; +__be16 version; gre =skb_header_pointer (pkt->skb, thoff,sizeof (_gre), &_gre);if (!gre)
Signature · 1 line
2.30.2