x86: fix ioport unification on 32-bit (9718769d) · Commits · 戴 / test

ioport unification was broken for 32-bit; it was missing the acutal pushf/popf EFLAGS manipulation (set_iopl_mask()). Also, use of volatile looks like leftover cruft. Cc: mboton@gmail.com Cc: Kevin Winchester <kjwinchester@gmail.com> Cc: Zach Brown <zach.brown@oracle.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by:

Chris Wright <chrisw@sous-sol.org> Signed-off-by:

Ingo Molnar <mingo@elte.hu> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de>

arch/x86/kernel/ioport.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -116,9 +116,10 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
		#ifdef CONFIG_X86_32
		asmlinkage long sys_iopl(unsigned long regsp)
		{
		volatile struct pt_regs regs = (struct pt_regs )&regsp;
		struct pt_regs regs = (struct pt_regs )&regsp;
		unsigned int level = regs->bx;
		unsigned int old = (regs->flags >> 12) & 3;
		struct thread_struct *t = &current->thread;

		if (level > 3)
		return -EINVAL;
		@@ -127,8 +128,9 @@ asmlinkage long sys_iopl(unsigned long regsp)
		if (!capable(CAP_SYS_RAWIO))
		return -EPERM;
		}
		t->iopl = level << 12;
		regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) \| (level << 12);

		set_iopl_mask(t->iopl);
		return 0;
		}
		#else

Admin message