From owner-cvs-all@FreeBSD.ORG  Sun Jun 13 02:50:26 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 013C416A4D0; Sun, 13 Jun 2004 02:50:26 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EDCC843D49; Sun, 13 Jun 2004 02:50:25 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5D2o7JZ085852;
	Sun, 13 Jun 2004 02:50:07 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5D2o7D7085851;
	Sun, 13 Jun 2004 02:50:07 GMT
	(envelope-from rwatson)
Message-Id: <200406130250.i5D2o7D7085851@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 13 Jun 2004 02:50:07 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/compat/svr4 svr4_stream.c src/sys/kern
 kern_prot.c sys_socket.c uipc_socket2.c uipc_syscalls.c
 uipc_usrreq.c src/sys/netatalk ddp_input.c ddp_output.c...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
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, 13 Jun 2004 02:50:26 -0000

rwatson     2004-06-13 02:50:07 UTC

  FreeBSD src repository

  Modified files:
    sys/compat/svr4      svr4_stream.c 
    sys/kern             kern_prot.c sys_socket.c uipc_socket2.c 
                         uipc_syscalls.c uipc_usrreq.c 
    sys/netatalk         ddp_input.c ddp_output.c 
    sys/netinet          in_pcb.c ip_divert.c tcp_input.c 
                         tcp_syncache.c 
    sys/security/mac     mac_socket.c 
    sys/sys              socketvar.h 
  Log:
  Socket MAC labels so_label and so_peerlabel are now protected by
  SOCK_LOCK(so):
  
  - Hold socket lock over calls to MAC entry points reading or
    manipulating socket labels.
  
  - Assert socket lock in MAC entry point implementations.
  
  - When externalizing the socket label, first make a thread-local
    copy while holding the socket lock, then release the socket lock
    to externalize to userspace.
  
  Revision  Changes    Path
  1.47      +4 -0      src/sys/compat/svr4/svr4_stream.c
  1.183     +2 -0      src/sys/kern/kern_prot.c
  1.58      +4 -0      src/sys/kern/sys_socket.c
  1.129     +2 -0      src/sys/kern/uipc_socket2.c
  1.192     +12 -0     src/sys/kern/uipc_syscalls.c
  1.124     +2 -0      src/sys/kern/uipc_usrreq.c
  1.24      +3 -0      src/sys/netatalk/ddp_input.c
  1.24      +2 -0      src/sys/netatalk/ddp_output.c
  1.149     +4 -1      src/sys/netinet/in_pcb.c
  1.90      +2 -0      src/sys/netinet/ip_divert.c
  1.238     +2 -0      src/sys/netinet/tcp_input.c
  1.58      +2 -0      src/sys/netinet/tcp_syncache.c
  1.2       +57 -8     src/sys/security/mac/mac_socket.c
  1.121     +2 -2      src/sys/sys/socketvar.h