renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

x86/ioperm: Remove bitmap if all permissions dropped

Browse Source 
If ioperm() results in a bitmap with all bits set (no permissions to any
I/O port), then handling that bitmap on context switch and exit to user
mode is pointless. Drop it.

Move the bitmap exit handling to the ioport code and reuse it for both the
thread exit path and dropping it. This allows to reuse this code for the
upcoming iopl() emulation.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Andy Lutomirski <luto@kernel.org>
This commit is contained in:
Thomas Gleixner 2019-11-11 23:03:24 +01:00
parent 22fe5b0439
commit ea5f1cd7ab
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/io_bitmap.h
View File

@ -11,6 +11,8 @@ struct io_bitmap {
unsigned long bitmap[IO_BITMAP_LONGS]; unsigned long bitmap[IO_BITMAP_LONGS];
}; };
void io_bitmap_exit(void);
void tss_update_io_bitmap(void); void tss_update_io_bitmap(void);
#endif #endif

19
arch/x86/kernel/ioport.c
View File

@ -16,6 +16,18 @@
static atomic64_t io_bitmap_sequence; static atomic64_t io_bitmap_sequence;
void io_bitmap_exit(void)
{
struct io_bitmap *iobm = current->thread.io_bitmap;
current->thread.io_bitmap = NULL;
clear_thread_flag(TIF_IO_BITMAP);
preempt_disable();
tss_update_io_bitmap();
preempt_enable();
kfree(iobm);
}
/* /*
* this changes the io permissions bitmap in the current task. * this changes the io permissions bitmap in the current task.
*/ */
@ -61,11 +73,16 @@ long ksys_ioperm(unsigned long from, unsigned long num, int turn_on)
* Search for a (possibly new) maximum. This is simple and stupid, * Search for a (possibly new) maximum. This is simple and stupid,
* to keep it obviously correct: * to keep it obviously correct:
*/ */
max_long = 0; max_long = UINT_MAX;
for (i = 0; i < IO_BITMAP_LONGS; i++) { for (i = 0; i < IO_BITMAP_LONGS; i++) {
if (iobm->bitmap[i] != ~0UL) if (iobm->bitmap[i] != ~0UL)
max_long = i; max_long = i;
} }
/* All permissions dropped? */
if (max_long == UINT_MAX) {
io_bitmap_exit();
return 0;
}
iobm->max = (max_long + 1) * sizeof(unsigned long); iobm->max = (max_long + 1) * sizeof(unsigned long);

15
arch/x86/kernel/process.c
View File

@ -102,21 +102,10 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
void exit_thread(struct task_struct *tsk) void exit_thread(struct task_struct *tsk)
{ {
struct thread_struct *t = &tsk->thread; struct thread_struct *t = &tsk->thread;
struct io_bitmap *iobm = t->io_bitmap;
struct fpu *fpu = &t->fpu; struct fpu *fpu = &t->fpu;
struct tss_struct *tss;
if (iobm) { if (test_thread_flag(TIF_IO_BITMAP))
preempt_disable(); io_bitmap_exit();
tss = this_cpu_ptr(&cpu_tss_rw);
t->io_bitmap = NULL;
clear_thread_flag(TIF_IO_BITMAP);
/* Invalidate the io bitmap base in the TSS */
tss->x86_tss.io_bitmap_base = IO_BITMAP_OFFSET_INVALID;
preempt_enable();
kfree(iobm);
}
free_vm86(t); free_vm86(t);