From owner-freebsd-current@FreeBSD.ORG  Tue Jul 26 05:43:32 2005
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: freebsd-current@freebsd.org
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2942B16A41F;
	Tue, 26 Jul 2005 05:43:32 +0000 (GMT)
	(envelope-from gnn@neville-neil.com)
Received: from mrout2.yahoo.com (mrout2.yahoo.com [216.145.54.172])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EE0E443D46;
	Tue, 26 Jul 2005 05:43:31 +0000 (GMT)
	(envelope-from gnn@neville-neil.com)
Received: from minion.local.neville-neil.com (proxy8.corp.yahoo.com
	[216.145.48.13])
	by mrout2.yahoo.com (8.13.4/8.13.4/y.out) with ESMTP id j6Q5ekax038613; 
	Mon, 25 Jul 2005 22:40:47 -0700 (PDT)
Date: Tue, 26 Jul 2005 14:40:50 +0900
Message-ID: <m2mzoaktul.wl%gnn@neville-neil.com>
From: gnn@freebsd.org
To: freebsd-net@freebsd.org
User-Agent: Wanderlust/2.12.2 (99 Luftballons) SEMI/1.14.6 (Maruoka)
	FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/21.3.50
	(powerpc-apple-darwin8.1.0) MULE/5.0 (SAKAKI)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Cc: freebsd-current@freebsd.org
Subject: Please test this patch for an IPv6 related Kernel Panic....
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jul 2005 05:43:32 -0000

Howdy,

The PR this addresses is 83885:

http://www.freebsd.org/cgi/query-pr.cgi?pr=83885

The patch in the PR is correct but misaligned for CURRENT.  I'd like
to commit this patch to current then MFC it.

I have tested this patch and it works for me.  Please comment etc.

Later,
George

Index: uipc_socket.c
===================================================================
RCS file: /Volumes/exported/FreeBSD-CVS/src/sys/kern/uipc_socket.c,v
retrieving revision 1.242
diff -u -r1.242 uipc_socket.c
--- uipc_socket.c	1 Jul 2005 16:28:30 -0000	1.242
+++ uipc_socket.c	26 Jul 2005 05:38:12 -0000
@@ -1162,7 +1162,10 @@
 			}
 			cm = cmn;
 		}
-		nextrecord = so->so_rcv.sb_mb->m_nextpkt;
+		if (so->so_rcv.sb_mb)
+			nextrecord = so->so_rcv.sb_mb->m_nextpkt;
+		else
+			nextrecord = NULL;
 		orig_resid = 0;
 	}
 	if (m != NULL) {