netfilter: nft_compat: fix sparse warning
Subsystems (2)
PATCH v2 1/1 netfilter: nft_compat: fix sparse warning
Quoted 1 line
Quoted 1 line
net/netfilter/nft_compat.c:140:37: sparse: incorrect type in assignment (different base types)
net/netfilter/nft_compat.c:140:37: expected restricted __be16 [usertype] ethproto
net/netfilter/nft_compat.c:140:37: got unsigned char [unsigned] [usertype] proto
Quoted 1 line
Quoted 1 line
net/netfilter/nft_compat.c:351:37: sparse: incorrect type in assignment (different base types)
net/netfilter/nft_compat.c:351:37: expected restricted __be16 [usertype] ethproto
net/netfilter/nft_compat.c:351:37: got unsigned char [unsigned] [usertype] proto
---
v2: use u16 for protocol and then cast it to __be16
net/netfilter/nft_compat.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
net/netfilter/nft_compat.c +7 -7
@@ -123,7 +123,7 @@ static void nft_target_set_tgchk_param(struct xt_tgchk_param *par, const struct nft_ctx *ctx, struct xt_target *target, void *info, - union nft_entry *entry, u8 proto, bool inv) + union nft_entry *entry, u16 proto, bool inv) { par->net = ctx->net; par->table = ctx->table->name;
@@ -137,7 +137,7 @@ nft_target_set_tgchk_param(struct xt_tgchk_param *par, entry->e6.ipv6.invflags = inv ?IP6T_INV_PROTO :0 ;break ;case NFPROTO_BRIDGE : - entry->ebt.ethproto = proto; + entry->ebt.ethproto = (__force __be16 )proto; entry->ebt.invflags = inv ?EBT_IPROTO :0 ;break ; }
@@ -171,7 +171,7 @@ static const struct nla_policy nft_rule_compat_policy[NFTA_RULE_COMPAT_MAX + 1] [NFTA_RULE_COMPAT_FLAGS] = { .type = NLA_U32 }, }; -static int nft_parse_compat (const struct nlattr *attr,u8 *proto,bool *inv) +static int nft_parse_compat (const struct nlattr *attr,u16 *proto,bool *inv) {struct nlattr *tb[NFTA_RULE_COMPAT_MAX +1 ];u32 flags;
@@ -203,7 +203,7 @@ nft_target_init(const struct nft_ctx *ctx, const struct nft_expr *expr,struct xt_target *target = expr->ops->data;struct xt_tgchk_param par;size_t size =XT_ALIGN (nla_len (tb[NFTA_TARGET_INFO ])); -u8 proto =0 ; +u16 proto =0 ;bool inv = false;union nft_entry e = {};int ret;
@@ -334,7 +334,7 @@ static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {static void nft_match_set_mtchk_param (struct xt_mtchk_param *par,const struct nft_ctx *ctx,struct xt_match *match,void *info, -union nft_entry *entry,u8 proto,bool inv) +union nft_entry *entry,u16 proto,bool inv) { par->net = ctx->net; par->table = ctx->table->name;
@@ -348,7 +348,7 @@ nft_match_set_mtchk_param(struct xt_mtchk_param *par, const struct nft_ctx *ctx, entry->e6.ipv6.invflags = inv ?IP6T_INV_PROTO :0 ;break ;case NFPROTO_BRIDGE : - entry->ebt.ethproto = proto; + entry->ebt.ethproto = (__force __be16 )proto; entry->ebt.invflags = inv ?EBT_IPROTO :0 ;break ; }
@@ -385,7 +385,7 @@ nft_match_init(const struct nft_ctx *ctx, const struct nft_expr *expr,struct xt_match *match = expr->ops->data;struct xt_mtchk_param par;size_t size =XT_ALIGN (nla_len (tb[NFTA_MATCH_INFO ])); -u8 proto =0 ; +u16 proto =0 ;bool inv = false;union nft_entry e = {};int ret;
Pablo Neira Ayuso
maintainerQuoted 6 lines · Arturo Borrero Gonzalez
Quoted 1 line
Quoted 1 line
net/netfilter/nft_compat.c:140:37: sparse: incorrect type in assignment (different base types)
net/netfilter/nft_compat.c:140:37: expected restricted__be16[usertype] ethproto
net/netfilter/nft_compat.c:140:37: got unsigned char [unsigned] [usertype] protoQuoted 1 line
Quoted 1 line
net/netfilter/nft_compat.c:351:37: sparse: incorrect type in assignment (different base types)
net/netfilter/nft_compat.c:351:37: expected restricted__be16[usertype] ethproto
net/netfilter/nft_compat.c:351:37: got unsigned char [unsigned] [usertype] proto
Please, reword the title and resubmit. Basically, sparse has discovered a real bug.
I'm telling this because we cannot pass patch to calm down sparse warnings to the 'net' tree and I would like to make sure that people understand that this is fixing a breakage in ebtables-compat, so it should follow the fast path to mainstream.
Thanks.