OSDN Git Service

Return ENODEV when the selected speculation misfeature is unsupported
authorAnthony Steinhauser <asteinhauser@google.com>
Mon, 16 Dec 2019 22:53:47 +0000 (14:53 -0800)
committerWill Deacon <will@kernel.org>
Wed, 8 Jan 2020 17:27:41 +0000 (17:27 +0000)
When the control of the selected speculation misbehavior is unsupported,
the kernel should return ENODEV according to the documentation:
https://www.kernel.org/doc/html/v4.17/userspace-api/spec_ctrl.html
Current aarch64 implementation of SSB control sometimes returns EINVAL
which is reserved for unimplemented prctl and for violations of reserved
arguments. This change makes the aarch64 implementation consistent with
the x86 implementation and with the documentation.

Signed-off-by: Anthony Steinhauser <asteinhauser@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/ssbd.c

index 52cfc61..b26955f 100644 (file)
@@ -37,7 +37,7 @@ static int ssbd_prctl_set(struct task_struct *task, unsigned long ctrl)
 
        /* Unsupported */
        if (state == ARM64_SSBD_UNKNOWN)
-               return -EINVAL;
+               return -ENODEV;
 
        /* Treat the unaffected/mitigated state separately */
        if (state == ARM64_SSBD_MITIGATED) {
@@ -102,7 +102,7 @@ static int ssbd_prctl_get(struct task_struct *task)
 {
        switch (arm64_get_ssbd_state()) {
        case ARM64_SSBD_UNKNOWN:
-               return -EINVAL;
+               return -ENODEV;
        case ARM64_SSBD_FORCE_ENABLE:
                return PR_SPEC_DISABLE;
        case ARM64_SSBD_KERNEL: