mm: Hardened usercopy

[mirror_ubuntu-artful-kernel.git] / include / linux / slab.h

diff --git a/include/linux/slab.h b/include/linux/slab.h
index aeb3e6d00a66be64ef522bfa63b6d2dd1c03df68..96a16a3fb7cbcfe9664343fa23c8104351977c60 100644 (file)
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -155,6 +155,18 @@ void kfree(const void *);
 void kzfree(const void *);
 size_t ksize(const void *);
 
+#ifdef CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR
+const char *__check_heap_object(const void *ptr, unsigned long n,
+                               struct page *page);
+#else
+static inline const char *__check_heap_object(const void *ptr,
+                                             unsigned long n,
+                                             struct page *page)
+{
+       return NULL;
+}
+#endif
+
 /*
  * Some archs want to perform DMA into kmalloc caches and need a guaranteed
  * alignment larger than the alignment of a 64-bit integer.