D56209.diff
No OneTemporary
Actions

Size

938 B

Referenced Files

None

Subscribers

None

D56209.diff
View Options

	diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
	--- a/sys/kern/kern_event.c
	+++ b/sys/kern/kern_event.c
	@@ -2013,10 +2013,11 @@
	to_free = NULL;
	if (fops->f_isfd) {
	fd = ident;
	- if (kq->kq_knlistsize <= fd) {
	- size = kq->kq_knlistsize;
	- while (size <= fd)
	+ size = atomic_load_int(&kq->kq_knlistsize);
	+ if (size <= fd) {
	+ do {
	size += KQEXTENT;
	+ } while (size <= fd);
	list = malloc(size * sizeof(*list), M_KQUEUE, mflag);
	if (list == NULL)
	return ENOMEM;
	@@ -2024,7 +2025,7 @@
	if ((kq->kq_state & KQ_CLOSING) != 0) {
	to_free = list;
	error = EBADF;
	- } else if (kq->kq_knlistsize > fd) {
	+ } else if (kq->kq_knlistsize >= size) {
	to_free = list;
	} else {
	if (kq->kq_knlist != NULL) {
	@@ -2039,6 +2040,7 @@
	kq->kq_knlistsize = size;
	kq->kq_knlist = list;
	}
	+ MPASS(error != 0 \|\| kq->kq_knlistsize > fd);
	KQ_UNLOCK(kq);
	}
	} else {