Skip to content

Commit

Permalink
ktrace(9): Avoid stomping over colliding KTROP_SET.
Browse files Browse the repository at this point in the history
Reported-by: syzbot+1e2a24aaa5725cab16e1@syzkaller.appspotmail.com
Reported-by: syzbot+3f89dc33fa3020fab1c4@syzkaller.appspotmail.com
Reported-by: syzbot+44898c094ce209759d53@syzkaller.appspotmail.com
Reported-by: syzbot+99826cb4b0494bfbb828@syzkaller.appspotmail.com
Reported-by: syzbot+a7c4752dc308936c48b2@syzkaller.appspotmail.com
Reported-by: syzbot+c062464baf148ed5f192@syzkaller.appspotmail.com
Reported-by: syzbot+dfa19489edc185f94b0a@syzkaller.appspotmail.com
Reported-by: syzbot+e2c4a8195d3ad84342dc@syzkaller.appspotmail.com
Reported-by: syzbot+f31927b2905188fddc22@syzkaller.appspotmail.com
  • Loading branch information
riastradh authored and riastradh committed Mar 12, 2022
1 parent 0dbc06c commit 46605d0
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
/* $NetBSD: kern_ktrace.c,v 1.178 2021/02/27 13:02:42 simonb Exp $ */
/* $NetBSD: kern_ktrace.c,v 1.179 2022/03/12 17:45:53 riastradh Exp $ */

/*-
* Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
Expand Down Expand Up @@ -61,7 +61,7 @@
*/

#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.178 2021/02/27 13:02:42 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.179 2022/03/12 17:45:53 riastradh Exp $");

#include <sys/param.h>
#include <sys/systm.h>
Expand Down Expand Up @@ -1396,7 +1396,11 @@ ktrace_thread(void *arg)
mutex_enter(&ktrace_lock);
}

TAILQ_REMOVE(&ktdq, ktd, ktd_list);
if (ktd_lookup(ktd->ktd_fp) == ktd) {
TAILQ_REMOVE(&ktdq, ktd, ktd_list);
} else {
/* nothing, collision in KTROP_SET */
}

callout_halt(&ktd->ktd_wakch, &ktrace_lock);
callout_destroy(&ktd->ktd_wakch);
Expand Down

0 comments on commit 46605d0

Please sign in to comment.