Skip to content

x86/iopl: Prevent user space from using CLI/STI with iopl(3)

Thomas Gleixner lkml oe-kbuild-all 3 versions – Applied

Status from this message: The following commit has been merged into the x86/iopl branch of tip:

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest20 patches 11 repliesApplied
  2. v216 patches 36 repliesSuperseded
  3. v19 patches 51 repliesSuperseded

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/20x86/ptrace: Prevent truncation of bitmap sizearch/x86/kernel/ptrace.c+1 -10 replies
2/20x86/process: Unify copy_thread_tls()arch/x86/include/asm/ptrace.h arch/x86/include/asm/switch_to.h arch/x86/kernel/process.c +2 more+110 -1435 replies
3/20x86/cpu: Unify cpu_init()arch/x86/kernel/cpu/common.c+66 -1090 replies
4/20x86/tss: Fix and move VMX BUILD_BUG_ON()arch/x86/kvm/vmx/vmx.c arch/x86/mm/cpu_entry_area.c+8 -80 replies
5/20x86/iopl: Cleanup include mazearch/x86/kernel/ioport.c+4 -120 replies
6/20x86/ioperm: Simplify first ioperm() invocation logicarch/x86/kernel/ioport.c+28 -290 replies
7/20x86/ioperm: Avoid bitmap allocation if no permissions are setarch/x86/kernel/ioport.c+3 -00 replies
8/20x86/io: Speedup schedule out of I/O bitmap userarch/x86/include/asm/processor.h arch/x86/kernel/cpu/common.c arch/x86/kernel/doublefault.c +2 more+67 -410 replies
9/20x86/tss: Move I/O bitmap data into a seperate structarch/x86/include/asm/processor.h arch/x86/kernel/cpu/common.c arch/x86/kernel/ioport.c +1 more+28 -210 replies
10/20x86/ioperm: Move iobitmap data into a structarch/x86/include/asm/io_bitmap.h arch/x86/include/asm/processor.h arch/x86/kernel/ioport.c +2 more+57 -390 replies
11/20x86/ioperm: Add bitmap sequence numberarch/x86/include/asm/io_bitmap.h arch/x86/include/asm/processor.h arch/x86/kernel/cpu/common.c +2 more+38 -100 replies
12/20x86/ioperm: Move TSS bitmap update to exit to user workarch/x86/entry/common.c arch/x86/include/asm/io_bitmap.h arch/x86/include/asm/thread_info.h +2 more+54 -453 replies
13/20x86/ioperm: Remove bitmap if all permissions droppedarch/x86/include/asm/io_bitmap.h arch/x86/kernel/ioport.c arch/x86/kernel/process.c+22 -140 replies
14/20x86/ioperm: Share I/O bitmap if identicalarch/x86/include/asm/io_bitmap.h arch/x86/kernel/ioport.c arch/x86/kernel/process.c+50 -420 replies
15/20selftests/x86/ioperm: Extend testing so the shared bitmap is exercisedtools/testing/selftests/x86/ioperm.c+15 -10 replies
16/20x86/iopl: Fixup misleading commentarch/x86/kernel/ioport.c+27 -80 replies
17/20x86/iopl: Restrict iopl() permission scopearch/x86/Kconfig arch/x86/include/asm/pgtable_32_types.h arch/x86/include/asm/processor.h +3 more+137 -452 replies
18/20x86/iopl: Remove legacy IOPL optionarch/x86/Kconfig arch/x86/include/asm/paravirt.h arch/x86/include/asm/paravirt_types.h +7 more+17 -1190 replies
19/20x86/ioperm: Extend IOPL config to control ioperm() as wellarch/x86/Kconfig arch/x86/include/asm/io_bitmap.h arch/x86/include/asm/processor.h +4 more+65 -200 replies
20/20selftests/x86/iopl: Extend test to cover IOPL emulationtools/testing/selftests/x86/iopl.c+118 -110 replies

Reviews trailers per patch

10 of 20 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchAndy LutomirskiPaolo BonziniIngo MolnarJuergen GrossPeter Zijlstra (Intel)
SeriesA-b
1/20R-b R-b
2/20A-b
3/20A-b
4/20A-b A-b
5/20A-b
6/20
7/20
8/20
9/20Originally-by
10/20
11/20
12/20
13/20A-b
14/20A-b
15/20
16/20A-b
17/20A-b
18/20A-b R-b
19/20
20/20

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v3 thread

Cover letter [patch V3 00/20] x86/iopl: Prevent user space from using CLI/STI with iopl(3)

This is the third version of the attempt to confine the unwanted side effects of iopl(). The first version of this series can be found here:

https://lore.kernel.org/r/[email protected]

Second version is here:

https://lore.kernel.org/r/[email protected]

The V1 cover letter also contains a longer variant of the background. Summary:

iopl(level = 3) enables aside of access to all 65536 I/O ports also the usage of CLI/STI in user space.

Disabling interrupts in user space can lead to system lockups and breaks assumptions in the kernel that userspace always runs with interrupts enabled.

iopl() is often preferred over ioperm() as it avoids the overhead of copying the tasks I/O bitmap to the TSS bitmap on context switch. This overhead can be avoided by providing a all zeroes bitmap in the TSS and switching the TSS bitmap offset to this permit all IO bitmap. It's marginally slower than iopl() which is a one time setup, but prevents the usage of CLI/STI in user space.

The changes vs. V3:

- Split out the restructuring of the first/subsequent ioperm() invocation into a seperate patch to address the inconsisteny which Andy detected in the patch which introduces the concept of invalidating the I/O bitmap base to speed up context switching. This change is moved in front so the subsequent changes are functionally correct.

- Moved the non HW TSS data related to I/O bitmap(s) into a seperate data structure. Modified version of Ingos proposed patch.

- Made struct memeber names more consistent (Ingo)

- Dropped the bitmap union. It is not longer necessary because V2 already dropped the finer grained copying algorithm. The sequence count approach should avoid most of the copying overhead when the number of ioperm() using processes is very low which is the normal case.

- Dropped the pointer storage of the bitmap in the TSS data as it is not required (Peter, Andy)

- Fixed the missing refcount setting in the bitmap duplication code path. (Peter, Andy)

- Updated changelog and comment to explain the bitmap invalidation logic. (Andy)

- Removed TIF_IO_BITMAP from the TIF flags which are evaluated on the next task for entering the slow path.

- Folded the NULL pointer check fix

- Simplified the config option in the legacy removal patch (Andy)

- Extended the scope of the config option to disable ioperm() along with iopl() which also mokes all related storage and functions compile time conditional. (Andy)

The series is also available from git:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git WIP.x86/iopl

Thanks,

tglx

---
 arch/x86/Kconfig                        |   18 ++
 arch/x86/entry/common.c                 |    4 
 arch/x86/include/asm/io_bitmap.h        |   29 ++++
 arch/x86/include/asm/paravirt.h         |    4 
 arch/x86/include/asm/paravirt_types.h   |    2 
 arch/x86/include/asm/pgtable_32_types.h |    2 
 arch/x86/include/asm/processor.h        |  113 ++++++++++-------
 arch/x86/include/asm/ptrace.h           |    6 
 arch/x86/include/asm/switch_to.h        |   10 +
 arch/x86/include/asm/thread_info.h      |   14 +-
 arch/x86/include/asm/xen/hypervisor.h   |    2 
 arch/x86/kernel/cpu/common.c            |  188 ++++++++++++----------------
 arch/x86/kernel/doublefault.c           |    2 
 arch/x86/kernel/ioport.c                |  209 +++++++++++++++++++++-----------
 arch/x86/kernel/paravirt.c              |    2 
 arch/x86/kernel/process.c               |  200 ++++++++++++++++++++++++------
 arch/x86/kernel/process_32.c            |   77 -----------
 arch/x86/kernel/process_64.c            |   86 -------------
 arch/x86/kernel/ptrace.c                |   12 +
 arch/x86/kvm/vmx/vmx.c                  |    8 -
 arch/x86/mm/cpu_entry_area.c            |    8 +
 arch/x86/xen/enlighten_pv.c             |   10 -
 tools/testing/selftests/x86/ioperm.c    |   16 ++
 tools/testing/selftests/x86/iopl.c      |  129 ++++++++++++++++++-
 24 files changed, 674 insertions(+), 477 deletions(-)