From owner-freebsd-net@FreeBSD.ORG  Sat May 14 15:52:03 2005
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
Delivered-To: freebsd-net@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5750116A4CE; Sat, 14 May 2005 15:52:03 +0000 (GMT)
Received: from mail-relay1.yahoo.com (mail-relay1.yahoo.com [216.145.48.34])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 409F843D46; Sat, 14 May 2005 15:52:03 +0000 (GMT)
	(envelope-from gnn@neville-neil.com)
Received: from minion.local.neville-neil.com (proxy7.corp.yahoo.com
	[216.145.48.98])j4EFq2kH055049;	Sat, 14 May 2005 08:52:02 -0700 (PDT)
Date: Sat, 14 May 2005 11:52:07 -0400
Message-ID: <m2mzqxyfdk.wl%gnn@neville-neil.com>
From: gnn@freebsd.org
To: net@freebsd.org
User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka)
	FLIM/1.14.6 (Marutamachi) APEL/10.6 Emacs/21.3.50 (powerpc-apple-darwin7.7.0)
	MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
cc: rwatson@freebsd.org
Subject: A couple of patches from KAME...
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
	<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 May 2005 15:52:03 -0000

Hi,

I'd like to commit this two fixes.  They both fix an inappropriate
access to a datastructure.

Comments please, I'd like to get these into the tree ASAP and then
will post an MFC date.

Later,
George


cvs diff: Diffing .
Index: getaddrinfo.c
===================================================================
RCS file: /Volumes/exported/FreeBSD-CVS/src/lib/libc/net/getaddrinfo.c,v
retrieving revision 1.66
diff -u -r1.66 getaddrinfo.c
--- getaddrinfo.c	2 May 2005 04:43:32 -0000	1.66
+++ getaddrinfo.c	14 May 2005 14:29:15 -0000
@@ -861,8 +861,8 @@
 		break;
 #endif
 	case AF_INET:
-		s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr;
-		d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr;
+		s = (u_char *)&((struct sockaddr_in *)src)->sin_addr;
+		d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr;
 		addrlen = sizeof(struct in_addr);
 		lim = s + addrlen;
 		break;
Index: name6.c
===================================================================
RCS file: /Volumes/exported/FreeBSD-CVS/src/lib/libc/net/name6.c,v
retrieving revision 1.51
diff -u -r1.51 name6.c
--- name6.c	2 May 2005 04:43:32 -0000	1.51
+++ name6.c	14 May 2005 15:48:47 -0000
@@ -1028,8 +1028,8 @@
 		break;
 #endif
 	case AF_INET:
-		s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr;
-		d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr;
+		s = (u_char *)&((struct sockaddr_in *)src)->sin_addr;
+		d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr;
 		addrlen = sizeof(struct in_addr);
 		lim = s + addrlen;
 		break;