From owner-cvs-src@FreeBSD.ORG  Tue Jul  3 10:14:14 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 763A416A41F;
	Tue,  3 Jul 2007 10:14:14 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 67E6A13C43E;
	Tue,  3 Jul 2007 10:14:14 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l63AEEeo026820;
	Tue, 3 Jul 2007 10:14:14 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l63AEE9Y026819;
	Tue, 3 Jul 2007 10:14:14 GMT (envelope-from rwatson)
Message-Id: <200707031014.l63AEE9Y026819@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 3 Jul 2007 10:14:13 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/sys socketvar.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2007 10:14:14 -0000

rwatson     2007-07-03 10:14:13 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/sys              socketvar.h 
  Log:
  Fix a bug in sblock() that has existed since revision 1.1 from BSD:
  correctly return an error if M_NOWAIT is passed to sblock() and the
  operation might block.  This remarkably subtle macro bug appears to
  be responsible for quite a few undiagnosed socket buffer corruption
  and mbuf-related kernel panics.
  
  This bug has already been fixed in 7-CURRENT as part of the move to
  using sx(9) locks to serialize simultaneous socket I/O, but is an
  MFC candidate for all earlier FreeBSD -STABLE branches.
  
  MFC after:      2 weeks
  Found by:       Isilon
  Submitted by:   jeff
  Tested by:      jhb, Yahoo!
  
  Revision   Changes    Path
  1.141.2.3  +1 -1      src/sys/sys/socketvar.h