From owner-cvs-all@FreeBSD.ORG  Sun Apr 27 15:50:01 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 276B81065675;
	Sun, 27 Apr 2008 15:50:01 +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 122558FC14;
	Sun, 27 Apr 2008 15:50:01 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3RFo0jn071941;
	Sun, 27 Apr 2008 15:50:00 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3RFo0R6071940;
	Sun, 27 Apr 2008 15:50:00 GMT (envelope-from rwatson)
Message-Id: <200804271550.m3RFo0R6071940@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 27 Apr 2008 15:50:00 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/kern uipc_syscalls.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Apr 2008 15:50:01 -0000

rwatson     2008-04-27 15:50:00 UTC

  FreeBSD src repository

  Modified files:
    sys/kern             uipc_syscalls.c 
  Log:
  When writing trailers in sendfile(2), don't call kern_writev()
  while holding the socket buffer lock.  These leads to an
  immediate panic due to recursing the socket buffer lock.  This
  bug was introduced in uipc_syscalls.c:1.240, but masked by
  another bug until that was fixed in uipc_syscalls.c:1.269.
  
  Note that the current fix isn't perfect, but better than
  panicking: normally we guarantee that simultaneous invocations
  of a system call to write on a stream socket won't be
  interlaced, which is ensured by use of the socket buffer sleep
  lock.  This is guaranteed for the sendfile headers, but not
  trailers.  In practice, this is likely not a problem, but
  should be fixed.
  
  MFC after:      3 days
  Pointy hat to:  andre (1.240), cperciva (1.269)
  
  Revision  Changes    Path
  1.271     +4 -3      src/sys/kern/uipc_syscalls.c