Module Name: src
Committed By: yamt
Date: Thu Oct 21 11:14:39 UTC 2010
Modified Files:
src/sys/kern: uipc_usrreq.c
Log Message:
unp_connect: fix an assertion
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/kern/uipc_usrreq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.131 src/sys/kern/uipc_usrreq.c:1.132
--- src/sys/kern/uipc_usrreq.c:1.131 Thu Oct 21 11:13:43 2010
+++ src/sys/kern/uipc_usrreq.c Thu Oct 21 11:14:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.131 2010/10/21 11:13:43 yamt Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.132 2010/10/21 11:14:39 yamt Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.131 2010/10/21 11:13:43 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.132 2010/10/21 11:14:39 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1001,7 +1001,7 @@
* see SO_ACCEPTCONN set on the endpoint, then it must
* be locked by the domain-wide uipc_lock.
*/
- KASSERT((so->so_options & SO_ACCEPTCONN) == 0 ||
+ KASSERT((so2->so_options & SO_ACCEPTCONN) == 0 ||
so2->so_lock == uipc_lock);
if ((so2->so_options & SO_ACCEPTCONN) == 0 ||
(so3 = sonewconn(so2, 0)) == NULL) {
