tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

netfilter: nf_tables: use the correct get/put helpers

Switch to be16/32 and u16/32 respectively. No code changes here,
the functions do the same thing, this is just for sparse checkers' sake.

objdiff shows no changes.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Florian Westphal and committed by
Pablo Neira Ayuso d86473bf 168141f7

+11 -10
+2 -1
net/netfilter/nft_byteorder.c
··· 44 44 case NFT_BYTEORDER_NTOH: 45 45 for (i = 0; i < priv->len / 8; i++) { 46 46 src64 = nft_reg_load64(&src[i]); 47 - nft_reg_store64(&dst[i], be64_to_cpu(src64)); 47 + nft_reg_store64(&dst[i], 48 + be64_to_cpu((__force __be64)src64)); 48 49 } 49 50 break; 50 51 case NFT_BYTEORDER_HTON:
+1 -1
net/netfilter/nft_osf.c
··· 99 99 if (nla_put_u8(skb, NFTA_OSF_TTL, priv->ttl)) 100 100 goto nla_put_failure; 101 101 102 - if (nla_put_be32(skb, NFTA_OSF_FLAGS, ntohl(priv->flags))) 102 + if (nla_put_u32(skb, NFTA_OSF_FLAGS, ntohl((__force __be32)priv->flags))) 103 103 goto nla_put_failure; 104 104 105 105 if (nft_dump_register(skb, NFTA_OSF_DREG, priv->dreg))
+4 -4
net/netfilter/nft_socket.c
··· 163 163 return -EOPNOTSUPP; 164 164 } 165 165 166 - priv->key = ntohl(nla_get_u32(tb[NFTA_SOCKET_KEY])); 166 + priv->key = ntohl(nla_get_be32(tb[NFTA_SOCKET_KEY])); 167 167 switch(priv->key) { 168 168 case NFT_SOCKET_TRANSPARENT: 169 169 case NFT_SOCKET_WILDCARD: ··· 179 179 if (!tb[NFTA_SOCKET_LEVEL]) 180 180 return -EINVAL; 181 181 182 - level = ntohl(nla_get_u32(tb[NFTA_SOCKET_LEVEL])); 182 + level = ntohl(nla_get_be32(tb[NFTA_SOCKET_LEVEL])); 183 183 if (level > 255) 184 184 return -EOPNOTSUPP; 185 185 ··· 202 202 { 203 203 const struct nft_socket *priv = nft_expr_priv(expr); 204 204 205 - if (nla_put_u32(skb, NFTA_SOCKET_KEY, htonl(priv->key))) 205 + if (nla_put_be32(skb, NFTA_SOCKET_KEY, htonl(priv->key))) 206 206 return -1; 207 207 if (nft_dump_register(skb, NFTA_SOCKET_DREG, priv->dreg)) 208 208 return -1; 209 209 if (priv->key == NFT_SOCKET_CGROUPV2 && 210 - nla_put_u32(skb, NFTA_SOCKET_LEVEL, htonl(priv->level))) 210 + nla_put_be32(skb, NFTA_SOCKET_LEVEL, htonl(priv->level))) 211 211 return -1; 212 212 return 0; 213 213 }
+4 -4
net/netfilter/nft_xfrm.c
··· 51 51 return -EOPNOTSUPP; 52 52 } 53 53 54 - priv->key = ntohl(nla_get_u32(tb[NFTA_XFRM_KEY])); 54 + priv->key = ntohl(nla_get_be32(tb[NFTA_XFRM_KEY])); 55 55 switch (priv->key) { 56 56 case NFT_XFRM_KEY_REQID: 57 57 case NFT_XFRM_KEY_SPI: ··· 134 134 WARN_ON_ONCE(1); 135 135 break; 136 136 case NFT_XFRM_KEY_DADDR_IP4: 137 - *dest = state->id.daddr.a4; 137 + *dest = (__force __u32)state->id.daddr.a4; 138 138 return; 139 139 case NFT_XFRM_KEY_DADDR_IP6: 140 140 memcpy(dest, &state->id.daddr.in6, sizeof(struct in6_addr)); 141 141 return; 142 142 case NFT_XFRM_KEY_SADDR_IP4: 143 - *dest = state->props.saddr.a4; 143 + *dest = (__force __u32)state->props.saddr.a4; 144 144 return; 145 145 case NFT_XFRM_KEY_SADDR_IP6: 146 146 memcpy(dest, &state->props.saddr.in6, sizeof(struct in6_addr)); ··· 149 149 *dest = state->props.reqid; 150 150 return; 151 151 case NFT_XFRM_KEY_SPI: 152 - *dest = state->id.spi; 152 + *dest = (__force __u32)state->id.spi; 153 153 return; 154 154 } 155 155