1 files changed, 12 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 01874d54f4fd..2da82eff0eb4 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -798,15 +798,25 @@ static int ssb_prctl_set(struct task_struct *task, unsigned long ctrl)
                 if (task_spec_ssb_force_disable(task))
                         return -EPERM;
                 task_clear_spec_ssb_disable(task);
+                task_clear_spec_ssb_noexec(task);
                 task_update_spec_tif(task);
                 break;
         case PR_SPEC_DISABLE:
                 task_set_spec_ssb_disable(task);
+                task_clear_spec_ssb_noexec(task);
                 task_update_spec_tif(task);
                 break;
         case PR_SPEC_FORCE_DISABLE:
                 task_set_spec_ssb_disable(task);
                 task_set_spec_ssb_force_disable(task);
+                task_clear_spec_ssb_noexec(task);
+                task_update_spec_tif(task);
+                break;
+        case PR_SPEC_DISABLE_NOEXEC:
+                if (task_spec_ssb_force_disable(task))
+                        return -EPERM;
+                task_set_spec_ssb_disable(task);
+                task_set_spec_ssb_noexec(task);
                 task_update_spec_tif(task);
                 break;
         default:
@@ -885,6 +895,8 @@ static int ssb_prctl_get(struct task_struct *task)
         case SPEC_STORE_BYPASS_PRCTL:
                 if (task_spec_ssb_force_disable(task))
                         return PR_SPEC_PRCTL | PR_SPEC_FORCE_DISABLE;
+                if (task_spec_ssb_noexec(task))
+                        return PR_SPEC_PRCTL | PR_SPEC_DISABLE_NOEXEC;
                 if (task_spec_ssb_disable(task))
                         return PR_SPEC_PRCTL | PR_SPEC_DISABLE;
                 return PR_SPEC_PRCTL | PR_SPEC_ENABLE;