From owner-svn-src-all@FreeBSD.ORG  Sat Sep  5 17:35:31 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5BD41106566B;
	Sat,  5 Sep 2009 17:35:31 +0000 (UTC)
	(envelope-from qingli@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4905D8FC0A;
	Sat,  5 Sep 2009 17:35:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n85HZVaY059895;
	Sat, 5 Sep 2009 17:35:31 GMT (envelope-from qingli@svn.freebsd.org)
Received: (from qingli@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n85HZVNd059893;
	Sat, 5 Sep 2009 17:35:31 GMT (envelope-from qingli@svn.freebsd.org)
Message-Id: <200909051735.n85HZVNd059893@svn.freebsd.org>
From: Qing Li <qingli@FreeBSD.org>
Date: Sat, 5 Sep 2009 17:35:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196868 - in stable/8/sys: . amd64/include/xen
	cddl/contrib/opensolaris contrib/dev/acpica contrib/pf
	dev/xen/xenpci netinet6
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Sep 2009 17:35:31 -0000

Author: qingli
Date: Sat Sep  5 17:35:31 2009
New Revision: 196868
URL: http://svn.freebsd.org/changeset/base/196868

Log:
  MFC	r196865
  
  This patch fixes an address scope violation. Considering the
  scenario where an anycast address is assigned on one interface,
  and a global address with the same scope is assigned on another
  interface. In other words, the interface owns the anycast
  address has only the link-local address as one other address.
  Without this patch, "ping6" the anycast address from another
  station will observe the source address of the returned ICMP6
  echo reply has the link-local address, not the global address
  that exists on the other interface in the same node.
  
  Reviewed by:    bz
  Approved by:	re

Modified:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet6/icmp6.c

Modified: stable/8/sys/netinet6/icmp6.c
==============================================================================
--- stable/8/sys/netinet6/icmp6.c	Sat Sep  5 17:29:08 2009	(r196867)
+++ stable/8/sys/netinet6/icmp6.c	Sat Sep  5 17:35:31 2009	(r196868)
@@ -2170,6 +2170,10 @@ icmp6_reflect(struct mbuf *m, size_t off
 		}
 	}
 
+	if ((srcp != NULL) && 
+	    (in6_addrscope(srcp) != in6_addrscope(&ip6->ip6_src)))
+		srcp = NULL;
+
 	if (srcp == NULL) {
 		int e;
 		struct sockaddr_in6 sin6;