2 files changed, 8 insertions, 11 deletions

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 088b80b4ce74..059298baa1dd 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -805,15 +805,6 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
                 fl.fl6_flowlabel = np->flow_label;
         }
 
-        if (ipv6_addr_any(daddr)) {
-                /*
-                 * unspecified destination address
-                 * treated as error... is this correct ?
-                 */
-                fl6_sock_release(flowlabel);
-                return(-EINVAL);
-        }
-
         if (fl.oif == 0)
                 fl.oif = sk->sk_bound_dev_if;
 
@@ -846,7 +837,10 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
         if (err)
                 goto out;
 
-        ipv6_addr_copy(&fl.fl6_dst, daddr);
+        if (!ipv6_addr_any(daddr))
+                ipv6_addr_copy(&fl.fl6_dst, daddr);
+        else
+                fl.fl6_dst.s6_addr[15] = 0x1; /* :: means loopback (BSD'ism) */
         if (ipv6_addr_any(&fl.fl6_src) && !ipv6_addr_any(&np->saddr))
                 ipv6_addr_copy(&fl.fl6_src, &np->saddr);
 
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 30ef7dc5d403..1fd784f3e2ec 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -752,7 +752,10 @@ do_udp_sendmsg:
         opt = ipv6_fixup_options(&opt_space, opt);
 
         fl.proto = sk->sk_protocol;
-        ipv6_addr_copy(&fl.fl6_dst, daddr);
+        if (!ipv6_addr_any(daddr))
+                ipv6_addr_copy(&fl.fl6_dst, daddr);
+        else
+                fl.fl6_dst.s6_addr[15] = 0x1; /* :: means loopback (BSD'ism) */
         if (ipv6_addr_any(&fl.fl6_src) && !ipv6_addr_any(&np->saddr))
                 ipv6_addr_copy(&fl.fl6_src, &np->saddr);
         fl.fl_ip_sport = inet->sport;