From owner-cvs-all@FreeBSD.ORG Sun Apr 9 08:57:21 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 55CD516A402; Sun, 9 Apr 2006 08:57:21 +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 6661543D45; Sun, 9 Apr 2006 08:57:20 +0000 (GMT) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 93C4E52126; Sun, 9 Apr 2006 10:57:18 +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 5F73150F93; Sun, 9 Apr 2006 10:57:13 +0200 (CEST) Date: Sun, 9 Apr 2006 10:55:59 +0200 From: Pawel Jakub Dawidek To: Robert Watson Message-ID: <20060409085559.GF2135@garage.freebsd.pl> References: <200604011620.k31GKsGQ028619@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="f61P+fpdnY2FZS1u" Content-Disposition: inline In-Reply-To: <200604011620.k31GKsGQ028619@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/netinet ip_divert.c raw_ip.c udp_usrreq.c src/sys/netinet6 raw_ip6.c udp6_usrreq.c 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: Sun, 09 Apr 2006 08:57:21 -0000 --f61P+fpdnY2FZS1u Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Apr 01, 2006 at 04:20:54PM +0000, Robert Watson wrote: +> rwatson 2006-04-01 16:20:54 UTC +>=20 +> FreeBSD src repository +>=20 +> Modified files: +> sys/netinet ip_divert.c raw_ip.c udp_usrreq.c=20 +> sys/netinet6 raw_ip6.c udp6_usrreq.c=20 +> Log: +> Update in_pcb-derived basic socket types following changes to +> pru_abort(), pru_detach(), and in_pcbdetach(): [...] +> - if (inp =3D=3D 0) { +> - INP_INFO_WUNLOCK(&divcbinfo); +> - return EINVAL; +> - } +> + KASSERT(inp =3D=3D NULL, ("div_bind: inp =3D=3D NULL")); This change seems to be wrong. EINVAL was returned when inp is equal to NULL and now you assert it. I think panic message is correct, but the check isn't. I haven't triggered the assert, though. +> - if (inp !=3D 0) { +> - INP_INFO_WUNLOCK(&udbinfo); +> - return EINVAL; +> - } +> - +> + KASSERT(inp =3D=3D NULL, ("udp6_attach: inp =3D=3D NULL")); Incorrect panic message here? Should be "udp6_attach: inp !=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! --f61P+fpdnY2FZS1u Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFEOMwfForvXbEpPzQRAtmAAJ0eVC+ZRFi/cqXuPWOz1vKB5wEibACgg09v l79Y3s+bh07BEFNUE7JdULY= =b1OI -----END PGP SIGNATURE----- --f61P+fpdnY2FZS1u--