Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90d827f0 authored by Máté Eckl's avatar Máté Eckl Committed by Pablo Neira Ayuso
Browse files

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: 4ed8eb65 ("netfilter: nf_tables: Add native tproxy support")
Signed-off-by: default avatarMáté Eckl <ecklm94@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent cdb2f401

net/netfilter/nft_tproxy.c

+3 −1
Original line number Diff line number Diff line
@@ -82,13 +82,15 @@ static void nft_tproxy_eval_v6(const struct nft_expr *expr, 
	const struct nft_tproxy *priv = nft_expr_priv(expr);

	struct sk_buff *skb = pkt->skb;

	const struct ipv6hdr *iph = ipv6_hdr(skb);

	struct in6_addr taddr = {0};

	struct in6_addr taddr;

	int thoff = pkt->xt.thoff;

	struct udphdr _hdr, *hp;

	__be16 tport = 0;

	struct sock *sk;

	int l4proto;



	memset(&taddr, 0, sizeof(taddr));



	if (!pkt->tprot_set) {

		regs->verdict.code = NFT_BREAK;

		return;