openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: nft_tproxy: Fix missing-braces warning 

This patch fixes a warning reported by the kbuild test robot (from linux-next
tree):
   net/netfilter/nft_tproxy.c: In function 'nft_tproxy_eval_v6':
>> net/netfilter/nft_tproxy.c:85:9: warning: missing braces around initializer [-Wmissing-braces]
     struct in6_addr taddr = {0};
            ^
   net/netfilter/nft_tproxy.c:85:9: warning: (near initialization for 'taddr.in6_u') [-Wmissing-braces]

This warning is actually caused by a gcc bug already resolved in newer
versions (kbuild used 4.9) so this kind of initialization is omitted and
memset is used instead.

Fixes: 4ed8eb6570 ("netfilter: nf_tables: Add native tproxy support")
Signed-off-by: Máté Eckl <ecklm94@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Máté Eckl 2018-08-14 22:09:10 +02:00 committed by Pablo Neira Ayuso
parent cdb2f40124
commit 90d827f06b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nft_tproxy.c
View File

@ -82,13 +82,15 @@ static void nft_tproxy_eval_v6(const struct nft_expr *expr,
const struct nft_tproxy *priv = nft_expr_priv(expr); const struct nft_tproxy *priv = nft_expr_priv(expr);
struct sk_buff *skb = pkt->skb; struct sk_buff *skb = pkt->skb;
const struct ipv6hdr *iph = ipv6_hdr(skb); const struct ipv6hdr *iph = ipv6_hdr(skb);
struct in6_addr taddr = {0}; struct in6_addr taddr;
int thoff = pkt->xt.thoff; int thoff = pkt->xt.thoff;
struct udphdr _hdr, *hp; struct udphdr _hdr, *hp;
__be16 tport = 0; __be16 tport = 0;
struct sock *sk; struct sock *sk;
int l4proto; int l4proto;
memset(&taddr, 0, sizeof(taddr));
if (!pkt->tprot_set) { if (!pkt->tprot_set) {
regs->verdict.code = NFT_BREAK; regs->verdict.code = NFT_BREAK;
return; return;