netfilter: nft_payload: use __be16 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] version
net/netfilter/nft_payload.c:112:25:    got restricted __be16
net/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 <kuba@kernel.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 9d2ac764a14c5754e9f874c624e3bf9ba51d5900..53e64d8aa01f0489b2e8a8994ebb16430fe47b62 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -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)