Commit 66394126 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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: c247897d ("netfilter: nft_payload: access GRE payload via inner offset")
Reported-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 6f1a298b

net/netfilter/nft_payload.c

+2 −1
Original line number Diff line number Diff line
@@ -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)