The patch titled
Subject: mm: SLAB freelist randomization
has been added to the -mm tree. Its filename is
mm-slab-freelist-randomization-v5.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-slab-freelist-randomization-v5.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-slab-freelist-randomization-v5.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Thomas Garnier <thgarnie@xxxxxxxxxx>
Subject: mm: SLAB freelist randomization
Signed-off-by: Thomas Garnier <thgarnie@xxxxxxxxxx>
Acked-by: Christoph Lameter <cl@xxxxxxxxx>
Cc: Pekka Enberg <penberg@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Laura Abbott <labbott@xxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/slab_def.h | 2 +-
init/Kconfig | 2 +-
mm/slab.c | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff -puN include/linux/slab_def.h~mm-slab-freelist-randomization-v5 include/linux/slab_def.h
--- a/include/linux/slab_def.h~mm-slab-freelist-randomization-v5
+++ a/include/linux/slab_def.h
@@ -80,7 +80,7 @@ struct kmem_cache {
struct kasan_cache kasan_info;
#endif
-#ifdef CONFIG_FREELIST_RANDOM
+#ifdef CONFIG_SLAB_FREELIST_RANDOM
void *random_seq;
#endif
diff -puN init/Kconfig~mm-slab-freelist-randomization-v5 init/Kconfig
--- a/init/Kconfig~mm-slab-freelist-randomization-v5
+++ a/init/Kconfig
@@ -1742,7 +1742,7 @@ config SLOB
endchoice
-config FREELIST_RANDOM
+config SLAB_FREELIST_RANDOM
default n
depends on SLAB
bool "SLAB freelist randomization"
diff -puN mm/slab.c~mm-slab-freelist-randomization-v5 mm/slab.c
--- a/mm/slab.c~mm-slab-freelist-randomization-v5
+++ a/mm/slab.c
@@ -1243,7 +1243,7 @@ static void __init set_up_node(struct km
}
}
-#ifdef CONFIG_FREELIST_RANDOM
+#ifdef CONFIG_SLAB_FREELIST_RANDOM
static void freelist_randomize(struct rnd_state *state, freelist_idx_t *list,
size_t count)
{
@@ -1295,7 +1295,7 @@ static inline int cache_random_seq_creat
return 0;
}
static inline void cache_random_seq_destroy(struct kmem_cache *cachep) { }
-#endif /* CONFIG_FREELIST_RANDOM */
+#endif /* CONFIG_SLAB_FREELIST_RANDOM */
/*
@@ -2537,7 +2537,7 @@ static void cache_init_objs_debug(struct
#endif
}
-#ifdef CONFIG_FREELIST_RANDOM
+#ifdef CONFIG_SLAB_FREELIST_RANDOM
/* Hold information during a freelist initialization */
union freelist_init_state {
struct {
@@ -2631,7 +2631,7 @@ static inline bool shuffle_freelist(stru
{
return false;
}
-#endif /* CONFIG_FREELIST_RANDOM */
+#endif /* CONFIG_SLAB_FREELIST_RANDOM */
static void cache_init_objs(struct kmem_cache *cachep,
struct page *page)
_
Patches currently in -mm which might be from thgarnie@xxxxxxxxxx are
mm-slab-freelist-randomization-v4.patch
mm-slab-freelist-randomization-v5.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
