Date: Sun, 9 Apr 2006 10:55:59 +0200 From: Pawel Jakub Dawidek <pjd@FreeBSD.org> To: Robert Watson <rwatson@FreeBSD.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 Message-ID: <20060409085559.GF2135@garage.freebsd.pl> In-Reply-To: <200604011620.k31GKsGQ028619@repoman.freebsd.org> References: <200604011620.k31GKsGQ028619@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060409085559.GF2135>