From owner-cvs-all@FreeBSD.ORG Sun Aug 31 21:54:42 2008 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A55C81065767; Sun, 31 Aug 2008 21:54:42 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91C488FC1B; Sun, 31 Aug 2008 21:54:42 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7VLsgMd019500; Sun, 31 Aug 2008 21:54:42 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7VLsgbR019499; Sun, 31 Aug 2008 21:54:42 GMT (envelope-from rwatson@repoman.freebsd.org) Message-Id: <200808312154.m7VLsgbR019499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rwatson@repoman.freebsd.org using -f From: Robert Watson Date: Sun, 31 Aug 2008 21:54:24 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/netinet6 icmp6.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2008 21:54:42 -0000 rwatson 2008-08-31 21:54:24 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/netinet6 icmp6.c Log: SVN rev 182575 on 2008-08-31 21:54:24Z by rwatson Merge r180968 from head to stable/7: When copying in and out current ICMPv6 filters on a raw IPv6 socket, lock the inpcb and use a local stack variable to copy to/from userspace so that sooptcopyin()/sooptcopyout() aren't called while holding an rwlock. While here, fix a bug in which a failed sooptcopyin() might lead to partially consistent ICMPv6 filters on the socket by not ignoring the error returned by sooptcopyin(). Revision Changes Path 1.80.2.4 +14 -6 src/sys/netinet6/icmp6.c