浏览代码

netfilter: nf_dup: fix sparse warnings

>> net/ipv4/netfilter/nft_dup_ipv4.c:29:37: sparse: incorrect type in initializer (different base types)
   net/ipv4/netfilter/nft_dup_ipv4.c:29:37:    expected restricted __be32 [user type] s_addr
   net/ipv4/netfilter/nft_dup_ipv4.c:29:37:    got unsigned int [unsigned] <noident>

>> net/ipv6/netfilter/nf_dup_ipv6.c:48:23: sparse: incorrect type in assignment (different base types)
   net/ipv6/netfilter/nf_dup_ipv6.c:48:23:    expected restricted __be32 [addressable] [assigned] [usertype] flowlabel
   net/ipv6/netfilter/nf_dup_ipv6.c:48:23:    got int

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Pablo Neira Ayuso 10 年之前
父节点
当前提交
59e26423e0
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      net/ipv4/netfilter/nft_dup_ipv4.c
  2. 2 2
      net/ipv6/netfilter/nf_dup_ipv6.c

+ 1 - 1
net/ipv4/netfilter/nft_dup_ipv4.c

@@ -26,7 +26,7 @@ static void nft_dup_ipv4_eval(const struct nft_expr *expr,
 {
 {
 	struct nft_dup_ipv4 *priv = nft_expr_priv(expr);
 	struct nft_dup_ipv4 *priv = nft_expr_priv(expr);
 	struct in_addr gw = {
 	struct in_addr gw = {
-		.s_addr = regs->data[priv->sreg_addr],
+		.s_addr = (__force __be32)regs->data[priv->sreg_addr],
 	};
 	};
 	int oif = regs->data[priv->sreg_dev];
 	int oif = regs->data[priv->sreg_dev];
 
 

+ 2 - 2
net/ipv6/netfilter/nf_dup_ipv6.c

@@ -45,8 +45,8 @@ static bool nf_dup_ipv6_route(struct sk_buff *skb, const struct in6_addr *gw,
 		fl6.flowi6_oif = oif;
 		fl6.flowi6_oif = oif;
 
 
 	fl6.daddr = *gw;
 	fl6.daddr = *gw;
-	fl6.flowlabel = ((iph->flow_lbl[0] & 0xF) << 16) |
-			 (iph->flow_lbl[1] << 8) | iph->flow_lbl[2];
+	fl6.flowlabel = (__force __be32)(((iph->flow_lbl[0] & 0xF) << 16) |
+			(iph->flow_lbl[1] << 8) | iph->flow_lbl[2]);
 	dst = ip6_route_output(net, NULL, &fl6);
 	dst = ip6_route_output(net, NULL, &fl6);
 	if (dst->error) {
 	if (dst->error) {
 		dst_release(dst);
 		dst_release(dst);