mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
5cfa860054
(cherry pick from commit 8a5e5e02fc83aaf67053ab53b359af08c6c49aaf)
Poison pointer values should be small enough to find a room in
non-mmap'able/hardly-mmap'able space. E.g. on x86 "poison pointer space"
is located starting from 0x0. Given unprivileged users cannot mmap
anything below mmap_min_addr, it should be safe to use poison pointers
lower than mmap_min_addr.
The current poison pointer values of LIST_POISON{1,2} might be too big for
mmap_min_addr values equal or less than 1 MB (common case, e.g. Ubuntu
uses only 0x10000). There is little point to use such a big value given
the "poison pointer space" below 1 MB is not yet exhausted. Changing it
to a smaller value solves the problem for small mmap_min_addr setups.
The values are suggested by Solar Designer:
http://www.openwall.com/lists/oss-security/2015/05/02/6
Signed-off-by: Vasily Kulikov <segoon@openwall.com>
Cc: Solar Designer <solar@openwall.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Bug: 26429468
Bug: 26186802
Bug: 26429658
Bug: 26428990
Bug: 26429465
Bug: 26429464
Change-Id: I28bddf3d76b3f16a7b46a391cd2af851718fdb75
89 lines
2.5 KiB
C
89 lines
2.5 KiB
C
#ifndef _LINUX_POISON_H
|
|
#define _LINUX_POISON_H
|
|
|
|
/********** include/linux/list.h **********/
|
|
|
|
/*
|
|
* Architectures might want to move the poison pointer offset
|
|
* into some well-recognized area such as 0xdead000000000000,
|
|
* that is also not mappable by user-space exploits:
|
|
*/
|
|
#ifdef CONFIG_ILLEGAL_POINTER_VALUE
|
|
# define POISON_POINTER_DELTA _AC(CONFIG_ILLEGAL_POINTER_VALUE, UL)
|
|
#else
|
|
# define POISON_POINTER_DELTA 0
|
|
#endif
|
|
|
|
/*
|
|
* These are non-NULL pointers that will result in page faults
|
|
* under normal circumstances, used to verify that nobody uses
|
|
* non-initialized list entries.
|
|
*/
|
|
#define LIST_POISON1 ((void *) 0x100 + POISON_POINTER_DELTA)
|
|
#define LIST_POISON2 ((void *) 0x200 + POISON_POINTER_DELTA)
|
|
|
|
/********** include/linux/timer.h **********/
|
|
/*
|
|
* Magic number "tsta" to indicate a static timer initializer
|
|
* for the object debugging code.
|
|
*/
|
|
#define TIMER_ENTRY_STATIC ((void *) 0x74737461)
|
|
|
|
/********** mm/debug-pagealloc.c **********/
|
|
#define PAGE_POISON 0xaa
|
|
|
|
/********** mm/slab.c **********/
|
|
/*
|
|
* Magic nums for obj red zoning.
|
|
* Placed in the first word before and the first word after an obj.
|
|
*/
|
|
#define RED_INACTIVE 0x09F911029D74E35BULL /* when obj is inactive */
|
|
#define RED_ACTIVE 0xD84156C5635688C0ULL /* when obj is active */
|
|
|
|
#define SLUB_RED_INACTIVE 0xbb
|
|
#define SLUB_RED_ACTIVE 0xcc
|
|
|
|
/* ...and for poisoning */
|
|
#define POISON_INUSE 0x5a /* for use-uninitialised poisoning */
|
|
#define POISON_FREE 0x6b /* for use-after-free poisoning */
|
|
#define POISON_END 0xa5 /* end-byte of poisoning */
|
|
|
|
/********** arch/$ARCH/mm/init.c **********/
|
|
#define POISON_FREE_INITMEM 0xcc
|
|
|
|
/********** arch/ia64/hp/common/sba_iommu.c **********/
|
|
/*
|
|
* arch/ia64/hp/common/sba_iommu.c uses a 16-byte poison string with a
|
|
* value of "SBAIOMMU POISON\0" for spill-over poisoning.
|
|
*/
|
|
|
|
/********** fs/jbd/journal.c **********/
|
|
#define JBD_POISON_FREE 0x5b
|
|
#define JBD2_POISON_FREE 0x5c
|
|
|
|
/********** drivers/base/dmapool.c **********/
|
|
#define POOL_POISON_FREED 0xa7 /* !inuse */
|
|
#define POOL_POISON_ALLOCATED 0xa9 /* !initted */
|
|
|
|
/********** drivers/atm/ **********/
|
|
#define ATM_POISON_FREE 0x12
|
|
#define ATM_POISON 0xdeadbeef
|
|
|
|
/********** net/ **********/
|
|
#define NEIGHBOR_DEAD 0xdeadbeef
|
|
#define NETFILTER_LINK_POISON 0xdead57ac
|
|
|
|
/********** kernel/mutexes **********/
|
|
#define MUTEX_DEBUG_INIT 0x11
|
|
#define MUTEX_DEBUG_FREE 0x22
|
|
|
|
/********** lib/flex_array.c **********/
|
|
#define FLEX_ARRAY_FREE 0x6c /* for use-after-free poisoning */
|
|
|
|
/********** security/ **********/
|
|
#define KEY_DESTROY 0xbd
|
|
|
|
/********** sound/oss/ **********/
|
|
#define OSS_POISON_FREE 0xAB
|
|
|
|
#endif
|