Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / arch / x86 / kernel / msr.c

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 113e70784854fb55bdc0eb08fe5e38bee4946126..0a690e125326572f135d0a6d5be272d4365d27cc 100644 (file)
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -39,6 +39,7 @@
 #include <linux/notifier.h>
 #include <linux/uaccess.h>
 #include <linux/gfp.h>
+#include <linux/grsecurity.h>
 
 #include <asm/processor.h>
 #include <asm/msr.h>
@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
        int err = 0;
        ssize_t bytes = 0;
 
+#ifdef CONFIG_GRKERNSEC_KMEM
+       gr_handle_msr_write();
+       return -EPERM;
+#endif
+
        if (count % 8)
                return -EINVAL; /* Invalid chunk size */
 
@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
                        err = -EBADF;
                        break;
                }
+#ifdef CONFIG_GRKERNSEC_KMEM
+               gr_handle_msr_write();
+               return -EPERM;
+#endif
                if (copy_from_user(&regs, uregs, sizeof regs)) {
                        err = -EFAULT;
                        break;
@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
        return notifier_from_errno(err);
 }
 
-static struct notifier_block __refdata msr_class_cpu_notifier = {
+static struct notifier_block msr_class_cpu_notifier = {
        .notifier_call = msr_class_cpu_callback,
 };