x86/iopl: Cure TIF_IO_BITMAP inconsistencies

io_bitmap_exit() is invoked from exit_thread() when a task exists or
when a fork fails. In the latter case the exit_thread() cleans up
resources which were allocated during fork().

io_bitmap_exit() invokes task_update_io_bitmap(), which in turn ends up
in tss_update_io_bitmap(). tss_update_io_bitmap() operates on the
current task. If current has TIF_IO_BITMAP set, but no bitmap installed,
tss_update_io_bitmap() crashes with a NULL pointer dereference.

There are two issues, which lead to that problem:

1) io_bitmap_exit() should not invoke task_update_io_bitmap() when
the task, which is cleaned up, is not the current task. That's a
clear indicator for a cleanup after a failed fork().

2) A task should not have TIF_IO_BITMAP set and neither a bitmap
installed nor IOPL emulation level 3 activated.

This happens when a kernel thread is created in the context of
a user space thread, which has TIF_IO_BITMAP set as the thread
flags are copied and the IO bitmap pointer is cleared.

Other than in the failed fork() case this has no impact because
kernel threads including IO workers never return to user space and
therefore never invoke tss_update_io_bitmap().

Cure this by adding the missing cleanups and checks:

1) Prevent io_bitmap_exit() to invoke task_update_io_bitmap() if
the to be cleaned up task is not the current task.

2) Clear TIF_IO_BITMAP in copy_thread() unconditionally. For user
space forks it is set later, when the IO bitmap is inherited in
io_bitmap_share().

For paranoia sake, add a warning into tss_update_io_bitmap() to catch
the case, when that code is invoked with inconsistent state.

Fixes: ea5f1cd7ab49 ("x86/ioperm: Remove bitmap if all permissions dropped")
Reported-by: syzbot+e2b1803445d236442e54@syzkaller.appspotmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/87wmdceom2.ffs@tglx

authored by Thomas Gleixner and committed by Borislav Petkov (AMD) 8b68e978 99850a1c

Changed files
+15 -4
arch
x86
+9 -4
arch/x86/kernel/ioport.c
··· 33 33 set_tsk_thread_flag(tsk, TIF_IO_BITMAP); 34 34 } 35 35 36 - static void task_update_io_bitmap(struct task_struct *tsk) 36 + static void task_update_io_bitmap(void) 37 37 { 38 + struct task_struct *tsk = current; 38 39 struct thread_struct *t = &tsk->thread; 39 40 40 41 if (t->iopl_emul == 3 || t->io_bitmap) { ··· 55 54 struct io_bitmap *iobm = tsk->thread.io_bitmap; 56 55 57 56 tsk->thread.io_bitmap = NULL; 58 - task_update_io_bitmap(tsk); 57 + /* 58 + * Don't touch the TSS when invoked on a failed fork(). TSS 59 + * reflects the state of @current and not the state of @tsk. 60 + */ 61 + if (tsk == current) 62 + task_update_io_bitmap(); 59 63 if (iobm && refcount_dec_and_test(&iobm->refcnt)) 60 64 kfree(iobm); 61 65 } ··· 198 192 } 199 193 200 194 t->iopl_emul = level; 201 - task_update_io_bitmap(current); 202 - 195 + task_update_io_bitmap(); 203 196 return 0; 204 197 } 205 198
+6
arch/x86/kernel/process.c
··· 176 176 frame->ret_addr = (unsigned long) ret_from_fork_asm; 177 177 p->thread.sp = (unsigned long) fork_frame; 178 178 p->thread.io_bitmap = NULL; 179 + clear_tsk_thread_flag(p, TIF_IO_BITMAP); 179 180 p->thread.iopl_warn = 0; 180 181 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps)); 181 182 ··· 464 463 *base = IO_BITMAP_OFFSET_VALID_ALL; 465 464 } else { 466 465 struct io_bitmap *iobm = t->io_bitmap; 466 + 467 + if (WARN_ON_ONCE(!iobm)) { 468 + clear_thread_flag(TIF_IO_BITMAP); 469 + native_tss_invalidate_io_bitmap(); 470 + } 467 471 468 472 /* 469 473 * Only copy bitmap data when the sequence number differs. The