diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-05-21 09:06:27 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2021-06-02 11:12:41 +0000 |
| commit | 623d96f4afb60eb0d6fcf5ba738d9880a3b10ca0 (patch) | |
| tree | beea62a0972a534ab17a0d7ac67fb3f37b7a9504 | |
| parent | 8d8bfdf20dc473a163c74bcd00b94b083f81ae0c (diff) | |
| download | src-623d96f4afb60eb0d6fcf5ba738d9880a3b10ca0.tar.gz src-623d96f4afb60eb0d6fcf5ba738d9880a3b10ca0.zip | |
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)
| -rw-r--r-- | sys/kern/subr_epoch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/subr_epoch.c b/sys/kern/subr_epoch.c index 210cf78d55f0..31b79513fdc2 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 |