signal: Add an optional check for altstack size

BugLink: https://bugs.launchpad.net/bugs/1967750
New x86 FPU features will be very large, requiring ~10k of stack in
signal handlers.  These new features require a new approach called
"dynamic features".

The kernel currently tries to ensure that altstacks are reasonably
sized. Right now, on x86, sys_sigaltstack() requires a size of >=2k.
However, that 2k is a constant. Simply raising that 2k requirement
to >10k for the new features would break existing apps which have a
compiled-in size of 2k.

Instead of universally enforcing a larger stack, prohibit a process from
using dynamic features without properly-sized altstacks. This must be
enforced in two places:

 * A dynamic feature can not be enabled without an large-enough altstack
   for each process thread.
 * Once a dynamic feature is enabled, any request to install a too-small
   altstack will be rejected

The dynamic feature enabling code must examine each thread in a
process to ensure that the altstacks are large enough. Add a new lock
(sigaltstack_lock()) to ensure that threads can not race and change
their altstack after being examined.

Add the infrastructure in form of a config option and provide empty
stubs for architectures which do not need dynamic altstack size checks.

This implementation will be fleshed out for x86 in a future patch called

  x86/arch_prctl: Add controls for dynamic XSTATE components

  [dhansen: commit message. ]

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20211021225527.10184-2-chang.seok.bae@intel.com
(cherry picked from commit 1bdda24c4af64cd2d65dec5192ab624c5fee7ca0)
Acked-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index d1e69d6e8498ba35d561df42e07587378fbf1714..dcd84e3ae7d4830fc615af94a7f7dc79617effb0 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -1291,6 +1291,9 @@ config ARCH_HAS_ELFCORE_COMPAT
 config ARCH_HAS_PARANOID_L1D_FLUSH
        bool
 
+config DYNAMIC_SIGFRAME
+       bool
+
 source "kernel/gcov/Kconfig"
 
 source "scripts/gcc-plugins/Kconfig"

diff --git a/include/linux/signal.h b/include/linux/signal.h
index 3f96a6374e4f14029d8191990d8b821c0ad4fb0a..7d34105e20c68e847067c9bec6a7989254be7165 100644 (file)
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -464,6 +464,12 @@ int __save_altstack(stack_t __user *, unsigned long);
        unsafe_put_user(t->sas_ss_size, &__uss->ss_size, label); \
 } while (0);
 
+#ifdef CONFIG_DYNAMIC_SIGFRAME
+bool sigaltstack_size_valid(size_t ss_size);
+#else
+static inline bool sigaltstack_size_valid(size_t size) { return true; }
+#endif /* !CONFIG_DYNAMIC_SIGFRAME */
+
 #ifdef CONFIG_PROC_FS
 struct seq_file;
 extern void render_sigset_t(struct seq_file *, const char *, sigset_t *);

diff --git a/kernel/signal.c b/kernel/signal.c
index 6e3dbb3d12170c02ab5d768269de9c9626d2219c..0b6a9ab634ccf8e4e8632a0ddb9785242d4288b2 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -4165,11 +4165,29 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
        return 0;
 }
 
+#ifdef CONFIG_DYNAMIC_SIGFRAME
+static inline void sigaltstack_lock(void)
+       __acquires(&current->sighand->siglock)
+{
+       spin_lock_irq(&current->sighand->siglock);
+}
+
+static inline void sigaltstack_unlock(void)
+       __releases(&current->sighand->siglock)
+{
+       spin_unlock_irq(&current->sighand->siglock);
+}
+#else
+static inline void sigaltstack_lock(void) { }
+static inline void sigaltstack_unlock(void) { }
+#endif
+
 static int
 do_sigaltstack (const stack_t *ss, stack_t *oss, unsigned long sp,
                size_t min_ss_size)
 {
        struct task_struct *t = current;
+       int ret = 0;
 
        if (oss) {
                memset(oss, 0, sizeof(stack_t));
@@ -4193,19 +4211,24 @@ do_sigaltstack (const stack_t *ss, stack_t *oss, unsigned long sp,
                                ss_mode != 0))
                        return -EINVAL;
 
+               sigaltstack_lock();
                if (ss_mode == SS_DISABLE) {
                        ss_size = 0;
                        ss_sp = NULL;
                } else {
                        if (unlikely(ss_size < min_ss_size))
-                               return -ENOMEM;
+                               ret = -ENOMEM;
+                       if (!sigaltstack_size_valid(ss_size))
+                               ret = -ENOMEM;
                }
-
-               t->sas_ss_sp = (unsigned long) ss_sp;
-               t->sas_ss_size = ss_size;
-               t->sas_ss_flags = ss_flags;
+               if (!ret) {
+                       t->sas_ss_sp = (unsigned long) ss_sp;
+                       t->sas_ss_size = ss_size;
+                       t->sas_ss_flags = ss_flags;
+               }
+               sigaltstack_unlock();
        }
-       return 0;
+       return ret;
 }
 
 SYSCALL_DEFINE2(sigaltstack,const stack_t __user *,uss, stack_t __user *,uoss)