Commit 75b2a603 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_bugs_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 bug documentation update from Borislav Petkov:

 - Add EPERM to the possible PR_SET_SPECULATION_CTRL pr_ctl() error
   codes to "legitimize" it

* tag 'x86_bugs_for_v7.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Documentation/x86: Fix PR_SET_SPECULATION_CTRL error codes
parents d1953aa3 4992ed78

Documentation/userspace-api/spec_ctrl.rst

+8 −4
Original line number Diff line number Diff line
@@ -81,11 +81,15 @@ Value Meaning 
ERANGE  arg3 is incorrect, i.e. it's neither PR_SPEC_ENABLE nor

        PR_SPEC_DISABLE nor PR_SPEC_FORCE_DISABLE.



ENXIO   Control of the selected speculation misfeature is not possible.

        See PR_GET_SPECULATION_CTRL.

ENXIO   For PR_SPEC_STORE_BYPASS: control of the selected speculation misfeature

        is not possible via prctl, because of the system's boot configuration.



EPERM   Speculation was disabled with PR_SPEC_FORCE_DISABLE and caller tried to

        enable it again.



EPERM   For PR_SPEC_L1D_FLUSH and PR_SPEC_INDIRECT_BRANCH: control of the

        mitigation is not possible because of the system's boot configuration.



EPERM   Speculation was disabled with PR_SPEC_FORCE_DISABLE and caller

        tried to enable it again.

======= =================================================================



Speculation misfeature controls