From: David S. Miller <davem@davemloft.net>
Date: Sat, 2 Mar 2019 20:54:35 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: Ubuntu-5.13.0-19.19~9093^2~32
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9eb359140cd307f8a14f61c19b155ffca5291057;p=mirror_ubuntu-jammy-kernel.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
---

9eb359140cd307f8a14f61c19b155ffca5291057
diff --cc net/sched/act_tunnel_key.c
index fc2b884b170c,3f943de9a2c9..2a5f215ae876
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@@ -388,13 -376,9 +388,14 @@@ static int tunnel_key_init(struct net *
  
  	return ret;
  
 +release_dst_cache:
 +#ifdef CONFIG_DST_CACHE
 +	if (metadata)
 +		dst_cache_destroy(&metadata->u.tun_info.dst_cache);
 +#endif
  release_tun_meta:
- 	dst_release(&metadata->dst);
+ 	if (metadata)
+ 		dst_release(&metadata->dst);
  
  err_out:
  	if (exists)