From owner-cvs-src@FreeBSD.ORG Sun Apr 9 09:07:04 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DCE1B16A402; Sun, 9 Apr 2006 09:07:04 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00ADD43D49; Sun, 9 Apr 2006 09:07:03 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id BAAF152126; Sun, 9 Apr 2006 11:07:02 +0200 (CEST) Received: from localhost (djw154.neoplus.adsl.tpnet.pl [83.24.0.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 3ABA950F93; Sun, 9 Apr 2006 11:06:55 +0200 (CEST) Date: Sun, 9 Apr 2006 11:05:41 +0200 From: Pawel Jakub Dawidek To: Robert Watson Message-ID: <20060409090541.GG2135@garage.freebsd.pl> References: <200604011542.k31Fg2B3020856@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="/i8j2F0k9BYX4qLc" Content-Disposition: inline In-Reply-To: <200604011542.k31Fg2B3020856@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r535 (FreeBSD) X-Spam-Flag: YES X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: *** X-Spam-Status: Yes, score=3.3 required=3.0 tests=BAYES_00,RCVD_IN_DSBL, RCVD_IN_NJABL_DUL,RCVD_IN_SORBS_DUL autolearn=no version=3.0.4 X-Spam-Report: =?ISO-8859-1?Q? * -2.6 BAYES_00 BODY: Bayesowskie prawdopodobie=f1stwo spamu wynosi 0 do 1% * [score: 0.0000] * 2.0 RCVD_IN_SORBS_DUL RBL: SORBS: sent directly from dynamic IP address * [83.24.0.154 listed in dnsbl.sorbs.net] * 3.8 RCVD_IN_DSBL RBL: Otrzymano przez relay listowany w list.dsbl.org * [] * 0.1 RCVD_IN_NJABL_DUL RBL: NJABL: nadawca dial-up u=bfywa nie lokalnego SMTP * [83.24.0.154 listed in combined.njabl.org]?= Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/kern uipc_socket.c uipc_socket2.c uipc_usrreq.c src/sys/net raw_cb.c raw_usrreq.c rtsock.c src/sys/netatalk ddp_usrreq.c src/sys/netatm atm_aal5.c atm_socket.c atm_usrreq.c atm_var.h src/sys/netgraph ng_socket.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Apr 2006 09:07:05 -0000 --/i8j2F0k9BYX4qLc Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 01, 2006 at 03:42:02PM +0000, Robert Watson wrote: +> rwatson 2006-04-01 15:42:02 UTC +>=20 +> FreeBSD src repository +>=20 +> Modified files: +> sys/kern uipc_socket.c uipc_socket2.c=20 +> uipc_usrreq.c=20 +> sys/net raw_cb.c raw_usrreq.c rtsock.c=20 +> sys/netatalk ddp_usrreq.c=20 +> sys/netatm atm_aal5.c atm_socket.c atm_usrreq.c=20 +> atm_var.h=20 +> sys/netgraph ng_socket.c=20 +> sys/netgraph/bluetooth/include ng_btsocket_hci_raw.h=20 +> ng_btsocket_l2cap.h=20 +> ng_btsocket_rfcomm.h=20 +> sys/netgraph/bluetooth/socket ng_btsocket_hci_raw.c=20 +> ng_btsocket_l2cap.c=20 +> ng_btsocket_l2cap_raw.c=20 +> ng_btsocket_rfcomm.c=20 +> sys/netinet ip_divert.c raw_ip.c tcp_usrreq.c=20 +> udp_usrreq.c=20 +> sys/netinet6 raw_ip6.c udp6_usrreq.c=20 +> sys/netipsec keysock.c=20 +> sys/netipx ipx_usrreq.c spx_usrreq.c=20 +> sys/netkey keysock.c=20 +> sys/netnatm natm.c=20 +> sys/sys protosw.h=20 +> Log: +> Chance protocol switch method pru_detach() so that it returns void +> rather than an error. Detaches do not "fail", they other occur or +> the protocol flags SS_PROTOREF to take ownership of the socket. +> =20 +> soclose() no longer looks at so_pcb to see if it's NULL, relying +> entirely on the protocol to decide whether it's time to free the +> socket or not using SS_PROTOREF. so_pcb is now entirely owned and +> managed by the protocol code. Likewise, no longer test so_pcb in +> other socket functions, such as soreceive(), which have no business +> digging into protocol internals. +> =20 +> Protocol detach routines no longer try to free the socket on detach, +> this is performed in the socket code if the protocol permits it. +> =20 +> In rts_detach(), no longer test for rp !=3D NULL in detach, and +> likewise in other protocols that don't permit a NULL so_pcb, reduce +> the incidence of testing for it during detach. +> =20 +> netinet and netinet6 are not fully updated to this change, which +> will be in an upcoming commit. In their current state they may leak +> memory or panic. [...] +> -static int +> +static void +> ngd_detach(struct socket *so) +> { +> struct ngpcb *const pcbp =3D sotongpcb(so); +> =20 +> - if (pcbp =3D=3D NULL) +> - return (EINVAL); +> + KASSERT(pcbp =3D=3D NULL, ("ngd_detach: pcbp =3D=3D NULL")); From what I see, it should be: KASSERT(pcbp !=3D NULL, ("ngd_detach: pcbp =3D=3D NULL")); --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --/i8j2F0k9BYX4qLc Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFEOM5lForvXbEpPzQRAreOAJ9a9psgaFmbANg6EmF1w/tlm2AlpACgoVXx 7L2ZcjkiivTfmamiOd0UGCY= =QqzY -----END PGP SIGNATURE----- --/i8j2F0k9BYX4qLc--