Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f22f47 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: slub: Panic instead of restoring corrupted bytes" into msm-4.9

parents e6826f07 5e0d9a2f
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -252,6 +252,10 @@ After reporting the details of the issue encountered the FIX SLUB message
tells us that SLUB has restored the Redzone to its proper value and then
system operations continue.

If it is required to only report the details of the issue and panic immediately
after in order to possibly catch any scribblers one can set the
CONFIG_DEBUG_SLUB_PANIC_ON option.

Emergency operations:
---------------------

+4 −0
Original line number Diff line number Diff line
@@ -703,8 +703,12 @@ static void init_object(struct kmem_cache *s, void *object, u8 val)
static void restore_bytes(struct kmem_cache *s, char *message, u8 data,
						void *from, void *to)
{
#ifdef CONFIG_SLUB_DEBUG_PANIC_ON
	panic("Found corruption 0x%p-0x%p=0x%x\n", from, to - 1, data);
#else
	slab_fix(s, "Restoring 0x%p-0x%p=0x%x\n", from, to - 1, data);
	memset(from, data, to - from);
#endif
}

static int check_bytes_and_report(struct kmem_cache *s, struct page *page,