diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-12 05:56:47 -0500 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-11-12 06:00:04 -0500 |
| commit | baf4750d92cdfb63d6535f7166c6189d07407b65 (patch) | |
| tree | a627a4e31c3e3694edd6db95a8a176399d216377 | |
| parent | f6c6339d5e945975066cb452c78a7cbe89413f37 (diff) | |
netfilter: nft_redir: fix sparse warnings
>> net/netfilter/nft_redir.c:39:26: sparse: incorrect type in assignment (different base types)
net/netfilter/nft_redir.c:39:26: expected unsigned int [unsigned] [usertype] nla_be32
net/netfilter/nft_redir.c:39:26: got restricted __be32
>> net/netfilter/nft_redir.c:40:40: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:40:40: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:40:40: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:40:40: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:40:40: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:40:40: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:46:34: sparse: incorrect type in assignment (different base types)
net/netfilter/nft_redir.c:46:34: expected unsigned int [unsigned] [usertype] nla_be32
net/netfilter/nft_redir.c:46:34: got restricted __be32
>> net/netfilter/nft_redir.c:47:48: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:47:48: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:47:48: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:47:48: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:47:48: sparse: cast to restricted __be32
>> net/netfilter/nft_redir.c:47:48: sparse: cast to restricted __be32
Fixes: e9105f1 ("netfilter: nf_tables: add new expression nft_redir")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | net/netfilter/nft_redir.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c index e27b4e35718a..9e8093f28311 100644 --- a/net/netfilter/nft_redir.c +++ b/net/netfilter/nft_redir.c | |||
| @@ -28,7 +28,6 @@ int nft_redir_init(const struct nft_ctx *ctx, | |||
| 28 | const struct nlattr * const tb[]) | 28 | const struct nlattr * const tb[]) |
| 29 | { | 29 | { |
| 30 | struct nft_redir *priv = nft_expr_priv(expr); | 30 | struct nft_redir *priv = nft_expr_priv(expr); |
| 31 | u32 nla_be32; | ||
| 32 | int err; | 31 | int err; |
| 33 | 32 | ||
| 34 | err = nft_chain_validate_dependency(ctx->chain, NFT_CHAIN_T_NAT); | 33 | err = nft_chain_validate_dependency(ctx->chain, NFT_CHAIN_T_NAT); |
| @@ -36,15 +35,17 @@ int nft_redir_init(const struct nft_ctx *ctx, | |||
| 36 | return err; | 35 | return err; |
| 37 | 36 | ||
| 38 | if (tb[NFTA_REDIR_REG_PROTO_MIN]) { | 37 | if (tb[NFTA_REDIR_REG_PROTO_MIN]) { |
| 39 | nla_be32 = nla_get_be32(tb[NFTA_REDIR_REG_PROTO_MIN]); | 38 | priv->sreg_proto_min = |
| 40 | priv->sreg_proto_min = ntohl(nla_be32); | 39 | ntohl(nla_get_be32(tb[NFTA_REDIR_REG_PROTO_MIN])); |
| 40 | |||
| 41 | err = nft_validate_input_register(priv->sreg_proto_min); | 41 | err = nft_validate_input_register(priv->sreg_proto_min); |
| 42 | if (err < 0) | 42 | if (err < 0) |
| 43 | return err; | 43 | return err; |
| 44 | 44 | ||
| 45 | if (tb[NFTA_REDIR_REG_PROTO_MAX]) { | 45 | if (tb[NFTA_REDIR_REG_PROTO_MAX]) { |
| 46 | nla_be32 = nla_get_be32(tb[NFTA_REDIR_REG_PROTO_MAX]); | 46 | priv->sreg_proto_max = |
| 47 | priv->sreg_proto_max = ntohl(nla_be32); | 47 | ntohl(nla_get_be32(tb[NFTA_REDIR_REG_PROTO_MAX])); |
| 48 | |||
| 48 | err = nft_validate_input_register(priv->sreg_proto_max); | 49 | err = nft_validate_input_register(priv->sreg_proto_max); |
| 49 | if (err < 0) | 50 | if (err < 0) |
| 50 | return err; | 51 | return err; |
