diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 17:48:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 17:48:14 -0400 |
commit | 1eccfa090eaea22558570054bbdc147817e1df5e (patch) | |
tree | a0adfdb87319abef88f575ee34314649193b7e92 /init | |
parent | 1bd4403d86a1c06cb6cc9ac87664a0c9d3413d51 (diff) | |
parent | ed18adc1cdd00a5c55a20fbdaed4804660772281 (diff) |
Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull usercopy protection from Kees Cook:
"Tbhis implements HARDENED_USERCOPY verification of copy_to_user and
copy_from_user bounds checking for most architectures on SLAB and
SLUB"
* tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
mm: SLUB hardened usercopy support
mm: SLAB hardened usercopy support
s390/uaccess: Enable hardened usercopy
sparc/uaccess: Enable hardened usercopy
powerpc/uaccess: Enable hardened usercopy
ia64/uaccess: Enable hardened usercopy
arm64/uaccess: Enable hardened usercopy
ARM: uaccess: Enable hardened usercopy
x86/uaccess: Enable hardened usercopy
mm: Hardened usercopy
mm: Implement stack frame object validation
mm: Add is_migrate_cma_page
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 69886493ff1e..cac3f096050d 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -1761,6 +1761,7 @@ choice | |||
1761 | 1761 | ||
1762 | config SLAB | 1762 | config SLAB |
1763 | bool "SLAB" | 1763 | bool "SLAB" |
1764 | select HAVE_HARDENED_USERCOPY_ALLOCATOR | ||
1764 | help | 1765 | help |
1765 | The regular slab allocator that is established and known to work | 1766 | The regular slab allocator that is established and known to work |
1766 | well in all environments. It organizes cache hot objects in | 1767 | well in all environments. It organizes cache hot objects in |
@@ -1768,6 +1769,7 @@ config SLAB | |||
1768 | 1769 | ||
1769 | config SLUB | 1770 | config SLUB |
1770 | bool "SLUB (Unqueued Allocator)" | 1771 | bool "SLUB (Unqueued Allocator)" |
1772 | select HAVE_HARDENED_USERCOPY_ALLOCATOR | ||
1771 | help | 1773 | help |
1772 | SLUB is a slab allocator that minimizes cache line usage | 1774 | SLUB is a slab allocator that minimizes cache line usage |
1773 | instead of managing queues of cached objects (SLAB approach). | 1775 | instead of managing queues of cached objects (SLAB approach). |