From owner-cvs-all@FreeBSD.ORG Sat Apr 1 15:15:06 2006 Return-Path: X-Original-To: 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 A01E116A400; Sat, 1 Apr 2006 15:15:06 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34DC443D49; Sat, 1 Apr 2006 15:15:06 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k31FF5xd019090; Sat, 1 Apr 2006 15:15:06 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k31FF5qS019089; Sat, 1 Apr 2006 15:15:05 GMT (envelope-from rwatson) Message-Id: <200604011515.k31FF5qS019089@repoman.freebsd.org> From: Robert Watson Date: Sat, 1 Apr 2006 15:15:05 +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_socket.c uipc_socket2.c uipc_usrreq.c src/sys/net raw_usrreq.c rtsock.c src/sys/netatalk ddp_usrreq.c src/sys/netatm atm_aal5.c atm_proto.c atm_usrreq.c atm_var.h src/sys/netgraph/bluetooth/include ng_btsocket_hci_raw.h ... 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: Sat, 01 Apr 2006 15:15:06 -0000 rwatson 2006-04-01 15:15:05 UTC FreeBSD src repository Modified files: sys/kern uipc_socket.c uipc_socket2.c uipc_usrreq.c sys/net raw_usrreq.c rtsock.c sys/netatalk ddp_usrreq.c sys/netatm atm_aal5.c atm_proto.c atm_usrreq.c atm_var.h sys/netgraph/bluetooth/include ng_btsocket_hci_raw.h ng_btsocket_l2cap.h ng_btsocket_rfcomm.h sys/netgraph/bluetooth/socket ng_btsocket_hci_raw.c ng_btsocket_l2cap.c ng_btsocket_l2cap_raw.c ng_btsocket_rfcomm.c sys/netinet raw_ip.c tcp_usrreq.c udp_usrreq.c sys/netinet6 raw_ip6.c udp6_usrreq.c sys/netipsec keysock.c sys/netipx ipx_usrreq.c spx_usrreq.c sys/netkey keysock.c sys/netnatm natm.c sys/sys protosw.h Log: Change protocol switch pru_abort() API so that it returns void rather than an int, as an error here is not meaningful. Modify soabort() to unconditionally free the socket on the return of pru_abort(), and modify most protocols to no longer conditionally free the socket, since the caller will do this. This commit likely leaves parts of netinet and netinet6 in a situation where they may panic or leak memory, as they have not are not fully updated by this commit. This will be corrected shortly in followup commits to these components. MFC after: 3 months Revision Changes Path 1.262 +29 -11 src/sys/kern/uipc_socket.c 1.154 +2 -2 src/sys/kern/uipc_socket2.c 1.164 +1 -5 src/sys/kern/uipc_usrreq.c 1.38 +2 -7 src/sys/net/raw_usrreq.c 1.134 +2 -2 src/sys/net/rtsock.c 1.48 +1 -3 src/sys/netatalk/ddp_usrreq.c 1.23 +18 -5 src/sys/netatm/atm_aal5.c 1.15 +14 -0 src/sys/netatm/atm_proto.c 1.25 +1 -1 src/sys/netatm/atm_usrreq.c 1.28 +1 -0 src/sys/netatm/atm_var.h 1.5 +1 -1 src/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h 1.6 +2 -2 src/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h 1.6 +1 -1 src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h 1.19 +2 -2 src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c 1.18 +2 -2 src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c 1.17 +2 -2 src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c 1.19 +2 -2 src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c 1.157 +4 -4 src/sys/netinet/raw_ip.c 1.129 +13 -5 src/sys/netinet/tcp_usrreq.c 1.183 +2 -3 src/sys/netinet/udp_usrreq.c 1.58 +4 -3 src/sys/netinet6/raw_ip6.c 1.57 +2 -3 src/sys/netinet6/udp6_usrreq.c 1.13 +3 -6 src/sys/netipsec/keysock.c 1.54 +2 -6 src/sys/netipx/ipx_usrreq.c 1.83 +2 -6 src/sys/netipx/spx_usrreq.c 1.33 +3 -6 src/sys/netkey/keysock.c 1.42 +2 -6 src/sys/netnatm/natm.c 1.51 +2 -2 src/sys/sys/protosw.h