1 files changed, 7 insertions, 5 deletions

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 81eb8cf8389b..fa9d988f4012 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -393,10 +393,10 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk,
         bool slow;
 
         if (flags & MSG_ERRQUEUE)
-                return ipv6_recv_error(sk, msg, len);
+                return ipv6_recv_error(sk, msg, len, addr_len);
 
         if (np->rxpmtu && np->rxopt.bits.rxpmtu)
-                return ipv6_recv_rxpmtu(sk, msg, len);
+                return ipv6_recv_rxpmtu(sk, msg, len, addr_len);
 
 try_again:
         skb = __skb_recv_datagram(sk, flags | (noblock ? MSG_DONTWAIT : 0),
@@ -538,8 +538,11 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         if (sk == NULL)
                 return;
 
-        if (type == ICMPV6_PKT_TOOBIG)
+        if (type == ICMPV6_PKT_TOOBIG) {
+                if (!ip6_sk_accept_pmtu(sk))
+                        goto out;
                 ip6_sk_update_pmtu(skb, sk, info);
+        }
         if (type == NDISC_REDIRECT) {
                 ip6_sk_redirect(skb, sk);
                 goto out;
@@ -1140,7 +1143,6 @@ do_udp_sendmsg:
                                 flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
                                 if (flowlabel == NULL)
                                         return -EINVAL;
-                                daddr = &flowlabel->dst;
                         }
                 }
 
@@ -1221,7 +1223,7 @@ do_udp_sendmsg:
 
         security_sk_classify_flow(sk, flowi6_to_flowi(&fl6));
 
-        dst = ip6_sk_dst_lookup_flow(sk, &fl6, final_p, true);
+        dst = ip6_sk_dst_lookup_flow(sk, &fl6, final_p);
         if (IS_ERR(dst)) {
                 err = PTR_ERR(dst);
                 dst = NULL;