1 files changed, 8 insertions, 6 deletions

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 2a7423c39456..059f0531f7c1 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2232,8 +2232,7 @@ static void ip6_link_failure(struct sk_buff *skb)
         if (rt) {
                 rcu_read_lock();
                 if (rt->rt6i_flags & RTF_CACHE) {
-                        if (dst_hold_safe(&rt->dst))
-                                rt6_remove_exception_rt(rt);
+                        rt6_remove_exception_rt(rt);
                 } else {
                         struct fib6_info *from;
                         struct fib6_node *fn;
@@ -2360,10 +2359,13 @@ EXPORT_SYMBOL_GPL(ip6_update_pmtu);
 
 void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, __be32 mtu)
 {
+        int oif = sk->sk_bound_dev_if;
         struct dst_entry *dst;
 
-        ip6_update_pmtu(skb, sock_net(sk), mtu,
-                        sk->sk_bound_dev_if, sk->sk_mark, sk->sk_uid);
+        if (!oif && skb->dev)
+                oif = l3mdev_master_ifindex(skb->dev);
+
+        ip6_update_pmtu(skb, sock_net(sk), mtu, oif, sk->sk_mark, sk->sk_uid);
 
         dst = __sk_dst_get(sk);
         if (!dst || !dst->obsolete ||
@@ -3214,8 +3216,8 @@ static int ip6_del_cached_rt(struct rt6_info *rt, struct fib6_config *cfg)
         if (cfg->fc_flags & RTF_GATEWAY &&
             !ipv6_addr_equal(&cfg->fc_gateway, &rt->rt6i_gateway))
                 goto out;
-        if (dst_hold_safe(&rt->dst))
-                rc = rt6_remove_exception_rt(rt);
+
+        rc = rt6_remove_exception_rt(rt);
 out:
         return rc;
 }