Page MenuHomeFreeBSD
Files F151904991

D56212.diff
No OneTemporary
Actions

D56212.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
@@ -1739,9 +1739,11 @@
KQ_LOCK(kq);
if (kev->ident < kq->kq_knlistsize) {
- SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link)
+ SLIST_FOREACH(kn, &kq->kq_knlist[kev->ident], kn_link) {
+ MPASS(kn->kn_kq == kq);
if (kev->filter == kn->kn_filter)
break;
+ }
}
} else {
if ((kev->flags & EV_ADD) == EV_ADD) {
@@ -1767,10 +1769,12 @@
list = &kq->kq_knhash[
KN_HASH((u_long)kev->ident, kq->kq_knhashmask)];
- SLIST_FOREACH(kn, list, kn_link)
+ SLIST_FOREACH(kn, list, kn_link) {
+ MPASS(kn->kn_kq == kq);
if (kev->ident == kn->kn_id &&
kev->filter == kn->kn_filter)
break;
+ }
}
}
@@ -2882,6 +2886,7 @@
KASSERT(kn_in_flux(kn), ("knote %p not marked influx", kn));
KQ_OWNED(kq);
+ MPASS(kn->kn_kq == kq);
if ((kq->kq_state & KQ_CLOSING) != 0)
return (EBADF);
@@ -2930,6 +2935,7 @@
msleep(kq, &kq->kq_lock, PSOCK, "kqflxwt", 0);
}
+ MPASS(kn->kn_kq == kq);
if (kn->kn_fop->f_isfd)
list = &kq->kq_knlist[kn->kn_id];
else
@@ -3106,6 +3112,7 @@
KQ_OWNED(kq);
kn = SLIST_FIRST(knlist);
while (kn != NULL) {
+ MPASS(kn->kn_kq == kq);
if ((kn->kn_status & KN_DETACHED) != 0 ||
(kn_in_flux(kn) && (kn->kn_status & KN_SCAN) == 0)) {
kn = SLIST_NEXT(kn, kn_link);
@@ -3139,6 +3146,7 @@
kq = kq1->kq_forksrc;
marker = knote_alloc(M_WAITOK);
marker->kn_status = KN_MARKER;
+ marker->kn_kq = kq;
KQ_LOCK(kq);
for (i = 0; i < kq->kq_knlistsize; i++) {
@@ -3250,6 +3258,7 @@
KQ_LOCK(kq);
for (i = 0; i < kq->kq_knlistsize; i++) {
SLIST_FOREACH(kn, &kq->kq_knlist[i], kn_link) {
+ MPASS(kn->kn_kq == kq);
error = kern_proc_kqueue_report_one(s, p, kq_fd,
kq, kn, compat32);
if (error != 0)
@@ -3260,6 +3269,7 @@
goto out;
for (i = 0; i <= kq->kq_knhashmask; i++) {
SLIST_FOREACH(kn, &kq->kq_knhash[i], kn_link) {
+ MPASS(kn->kn_kq == kq);
error = kern_proc_kqueue_report_one(s, p, kq_fd,
kq, kn, compat32);
if (error != 0)

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 11:24 AM (15 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30741738
Default Alt Text
D56212.diff (2 KB)

Event Timeline