diff mbox

[SRU,Yakkety,1/1] mm/slub.c: fix random_seq offset destruction

Message ID 73a2657b2f91dc5f3514728608073b6cd0b85379.1489171853.git.joseph.salisbury@canonical.com
State New
Headers show

Commit Message

Joseph Salisbury March 10, 2017, 6:56 p.m. UTC 
From: Sean Rees <sean@erifax.org>

BugLink: http://bugs.launchpad.net/bugs/1663991

Commit 210e7a43fa90 ("mm: SLUB freelist randomization") broke USB hub
initialisation as described in

  https://bugzilla.kernel.org/show_bug.cgi?id=177551.

Bail out early from init_cache_random_seq if s->random_seq is already
initialised.  This prevents destroying the previously computed
random_seq offsets later in the function.

If the offsets are destroyed, then shuffle_freelist will truncate
page->freelist to just the first object (orphaning the rest).

Fixes: 210e7a43fa90 ("mm: SLUB freelist randomization")
Link: http://lkml.kernel.org/r/20170207140707.20824-1-sean@erifax.org
Signed-off-by: Sean Rees <sean@erifax.org>
Reported-by: <userwithuid@gmail.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Thomas Garnier <thgarnie@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit a810007afe239d59c1115fcaa06eb5b480f876e9)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
---
 mm/slub.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Tim Gardner March 10, 2017, 7:16 p.m. UTC | #1
diff mbox

Patch

diff --git a/mm/slub.c b/mm/slub.c
index 379b796..0288bc5 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1423,6 +1423,10 @@  static int init_cache_random_seq(struct kmem_cache *s)
 	int err;
 	unsigned long i, count = oo_objects(s->oo);
 
+	/* Bailout if already initialised */
+	if (s->random_seq)
+		return 0;
+
 	err = cache_random_seq_create(s, count, GFP_KERNEL);
 	if (err) {
 		pr_err("SLUB: Unable to initialize free list for %s\n",