diff options
author | David S. Miller <davem@davemloft.net> | 2018-04-25 23:04:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-25 23:04:22 -0400 |
commit | a9537c937c1790b62de5e2789e67c0bf439b11ea (patch) | |
tree | f258739642417d820e1683e97966a3804f323ba9 /net/core/filter.c | |
parent | Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (diff) | |
download | linux-dev-a9537c937c1790b62de5e2789e67c0bf439b11ea.tar.xz linux-dev-a9537c937c1790b62de5e2789e67c0bf439b11ea.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merging net into net-next to help the bpf folks avoid
some really ugly merge conflicts.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/filter.c')
-rw-r--r-- | net/core/filter.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/filter.c b/net/core/filter.c index e25bc4a3aa1a..a2d093c581f1 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3280,6 +3280,7 @@ BPF_CALL_4(bpf_skb_set_tunnel_key, struct sk_buff *, skb, skb_dst_set(skb, (struct dst_entry *) md); info = &md->u.tun_info; + memset(info, 0, sizeof(*info)); info->mode = IP_TUNNEL_INFO_TX; info->key.tun_flags = TUNNEL_KEY | TUNNEL_CSUM | TUNNEL_NOCACHE; |