From 623d96f4afb60eb0d6fcf5ba738d9880a3b10ca0 Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Fri, 21 May 2021 11:06:27 +0200 Subject: [PATCH] Accessing the epoch structure should happen after the INIT_CHECK(). Else the epoch pointer may be NULL. Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit c82c200622b5380b8346de29879222538653f663) --- sys/kern/subr_epoch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 210cf78d55f..31b79513fdc 100644 --- a/sys/kern/subr_epoch.c +++ b/sys/kern/subr_epoch.c @@ -442,13 +442,14 @@ _epoch_enter_preempt(epoch_t epoch, epoch_tracker_t et EPOCH_FILE_LINE) struct thread *td; MPASS(cold || epoch != NULL); - MPASS(epoch->e_flags & EPOCH_PREEMPT); td = curthread; MPASS((vm_offset_t)et >= td->td_kstack && (vm_offset_t)et + sizeof(struct epoch_tracker) <= td->td_kstack + td->td_kstack_pages * PAGE_SIZE); INIT_CHECK(epoch); + MPASS(epoch->e_flags & EPOCH_PREEMPT); + #ifdef EPOCH_TRACE epoch_trace_enter(td, epoch, et, file, line); #endif