From owner-p4-projects@FreeBSD.ORG  Tue Aug 18 09:37:15 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF98A1065697; Tue, 18 Aug 2009 09:37:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A42581065693
	for <perforce@FreeBSD.org>; Tue, 18 Aug 2009 09:37:14 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 921D88FC3F
	for <perforce@FreeBSD.org>; Tue, 18 Aug 2009 09:37:14 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7I9bE2i028743
	for <perforce@FreeBSD.org>; Tue, 18 Aug 2009 09:37:14 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7I9bE6Z028741
	for perforce@freebsd.org; Tue, 18 Aug 2009 09:37:14 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 18 Aug 2009 09:37:14 GMT
Message-Id: <200908180937.n7I9bE6Z028741@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167467 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Aug 2009 09:37:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=167467

Change 167467 by anchie@anchie_malimis on 2009/08/18 09:37:09

	Clear any possible internally embedded scope before passing the
	packet to userspace for SeND cryptographic signature validation.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#24 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#24 (text+ko) ====

@@ -17,8 +17,9 @@
 #include <net/route.h>
 #include <net/if.h>
 
+#include <netinet6/in6_var.h>
+#include <netinet6/scope6_var.h>
 #include <netinet6/send.h>
-#include <netinet6/in6_var.h>
 
 MALLOC_DEFINE(M_SEND, "send", "Secure Neighbour Discovery");
 
@@ -92,9 +93,16 @@
 {
 	u_int len;
 	void *data;
+	struct ip6_hdr *ip6;
 
-	if (m->m_flags & M_MCAST)
-		printf("%s: DEBUG %p M_MCAST packet\n", __func__, m);
+	/*
+	 * Make sure to clear any possible internally embedded scope before 
+	 * passing the packet to userspace for SeND cryptographic signature
+	 * validation to succeed.
+	 */
+	ip6 = mtod(m, struct ip6_hdr *);
+	in6_clearscope(&ip6->ip6_src);
+	in6_clearscope(&ip6->ip6_dst); 
 
 	len = m_length(m, NULL);
 	if (len != msglen)