2 files changed, 11 insertions, 1 deletions

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 5d420095190f..9a809a4b3d86 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -556,7 +556,9 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
 
         saddr = &ipv6_hdr(skb)->daddr;
 
-        if (!ipv6_unicast_destination(skb))
+        if (!ipv6_unicast_destination(skb) &&
+            !(net->ipv6.anycast_src_echo_reply &&
+              ipv6_anycast_destination(skb)))
                 saddr = NULL;
 
         memcpy(&tmp_hdr, icmph, sizeof(tmp_hdr));
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 107b2f1d90ae..6b6a2c83027e 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -24,6 +24,13 @@ static struct ctl_table ipv6_table_template[] = {
                 .mode           = 0644,
                 .proc_handler   = proc_dointvec
         },
+        {
+                .procname       = "anycast_src_echo_reply",
+                .data           = &init_net.ipv6.anycast_src_echo_reply,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = proc_dointvec
+        },
         { }
 };
 
@@ -51,6 +58,7 @@ static int __net_init ipv6_sysctl_net_init(struct net *net)
         if (!ipv6_table)
                 goto out;
         ipv6_table[0].data = &net->ipv6.sysctl.bindv6only;
+        ipv6_table[1].data = &net->ipv6.anycast_src_echo_reply;
 
         ipv6_route_table = ipv6_route_sysctl_init(net);
         if (!ipv6_route_table)