Date: Sat, 1 Aug 2009 00:17:19 +0200 From: Ed Schouten <ed@80386.nl> To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= <des@des.no> Cc: jmg@FreeBSD.org, d@delphij.net, MQ <antinvidia@gmail.com>, freebsd-arch@FreeBSD.org Subject: Re: [PATCH] type issue in kern_event.c Message-ID: <20090731221719.GS1292@hoeg.nl> In-Reply-To: <86ocr062w9.fsf@ds4.des.no> References: <4A72B1DC.3040907@delphij.net> <86ocr062w9.fsf@ds4.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--Wt10+cXOThorkX0z
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hi Dag-Erling,
* Dag-Erling Sm=F8rgrav <des@des.no> wrote:
> Xin LI <delphij@delphij.net> writes:
> > I think these should be fixed, and here is my proposed patch.
>=20
> 404 Patch Not Found
Xin Li sent it to me, but I think he has forgotten to add the lists back
to Cc again. Here's the patch he sent to me earlier today.
Index: kern_event.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- kern_event.c (revision 195945)
+++ kern_event.c (working copy)
@@ -1106,7 +1106,7 @@ kqueue_expand(struct kqueue *kq, struct filterops
size =3D kq->kq_knlistsize;
while (size <=3D fd)
size +=3D KQEXTENT;
- list =3D malloc(size * sizeof list, M_KQUEUE, mflag);
+ list =3D malloc(size * sizeof *list, M_KQUEUE, mflag);
if (list =3D=3D NULL)
return ENOMEM;
KQ_LOCK(kq);
@@ -1116,13 +1116,13 @@ kqueue_expand(struct kqueue *kq, struct filterops
} else {
if (kq->kq_knlist !=3D NULL) {
bcopy(kq->kq_knlist, list,
- kq->kq_knlistsize * sizeof list);
+ kq->kq_knlistsize * sizeof *list);
free(kq->kq_knlist, M_KQUEUE);
kq->kq_knlist =3D NULL;
}
bzero((caddr_t)list +
kq->kq_knlistsize * sizeof list,
- (size - kq->kq_knlistsize) * sizeof list);
+ (size - kq->kq_knlistsize) * sizeof *list);
kq->kq_knlistsize =3D size;
kq->kq_knlist =3D list;
}
--=20
Ed Schouten <ed@80386.nl>
WWW: http://80386.nl/
--Wt10+cXOThorkX0z
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (FreeBSD)
iEYEARECAAYFAkpzbW8ACgkQ52SDGA2eCwXWdACeMw2Xu46RripyiwLKklHHEuS0
VQAAnA+CFWNyG2TZTQsU2fbcj1acL+62
=EaP6
-----END PGP SIGNATURE-----
--Wt10+cXOThorkX0z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090731221719.GS1292>