The patch titled
Subject: rbtree: use designated initializers
has been added to the -mm tree. Its filename is
rbtree-use-designated-initializers.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rbtree-use-designated-initializers.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rbtree-use-designated-initializers.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: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: rbtree: use designated initializers
Prepare to mark sensitive kernel structures for randomization by making
sure they're using designated initializers. These were identified during
allyesconfig builds of x86, arm, and arm64, with most initializer fixes
extracted from grsecurity.
Link: http://lkml.kernel.org/r/20161217010253.GA140470@beast
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Acked-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Cc: David Howells <dhowells@xxxxxxxxxx>
Cc: Jie Chen <fykcee1@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/rbtree_augmented.h | 4 +++-
lib/rbtree.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff -puN include/linux/rbtree_augmented.h~rbtree-use-designated-initializers include/linux/rbtree_augmented.h
--- a/include/linux/rbtree_augmented.h~rbtree-use-designated-initializers
+++ a/include/linux/rbtree_augmented.h
@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old
old->rbaugmented = rbcompute(old); \
} \
rbstatic const struct rb_augment_callbacks rbname = { \
- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
+ .propagate = rbname ## _propagate, \
+ .copy = rbname ## _copy, \
+ .rotate = rbname ## _rotate \
};
diff -puN lib/rbtree.c~rbtree-use-designated-initializers lib/rbtree.c
--- a/lib/rbtree.c~rbtree-use-designated-initializers
+++ a/lib/rbtree.c
@@ -427,7 +427,9 @@ static inline void dummy_copy(struct rb_
static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
static const struct rb_augment_callbacks dummy_callbacks = {
- dummy_propagate, dummy_copy, dummy_rotate
+ .propagate = dummy_propagate,
+ .copy = dummy_copy,
+ .rotate = dummy_rotate
};
void rb_insert_color(struct rb_node *node, struct rb_root *root)
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
rbtree-use-designated-initializers.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
