kasan: move kasan_report() into report.c

[thirdparty/linux.git] / mm / kasan / report.c

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 80f23c9da6b08062f32f668ede36b81a50ba4c95..51ec45407a0b95805b5fce85e20295edb9d7de7f 100644 (file)
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -29,6 +29,7 @@
 #include <linux/kasan.h>
 #include <linux/module.h>
 #include <linux/sched/task_stack.h>
+#include <linux/uaccess.h>
 
 #include <asm/sections.h>
 
@@ -454,7 +455,7 @@ static void print_shadow_for_address(const void *addr)
        }
 }
 
-bool report_enabled(void)
+static bool report_enabled(void)
 {
        if (current->kasan_depth)
                return false;
@@ -479,7 +480,8 @@ void kasan_report_invalid_free(void *object, unsigned long ip)
        end_report(&flags);
 }
 
-void __kasan_report(unsigned long addr, size_t size, bool is_write, unsigned long ip)
+static void __kasan_report(unsigned long addr, size_t size, bool is_write,
+                               unsigned long ip)
 {
        struct kasan_access_info info;
        void *tagged_addr;
@@ -518,6 +520,22 @@ void __kasan_report(unsigned long addr, size_t size, bool is_write, unsigned lon
        end_report(&flags);
 }
 
+bool kasan_report(unsigned long addr, size_t size, bool is_write,
+                       unsigned long ip)
+{
+       unsigned long flags = user_access_save();
+       bool ret = false;
+
+       if (likely(report_enabled())) {
+               __kasan_report(addr, size, is_write, ip);
+               ret = true;
+       }
+
+       user_access_restore(flags);
+
+       return ret;
+}
+
 #ifdef CONFIG_KASAN_INLINE
 /*
  * With CONFIG_KASAN_INLINE, accesses to bogus pointers (outside the high