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

Commit f231aebf authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: David Howells <dhowells@redhat.com>
Cc: Jie Chen <fykcee1@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4f5901f5

include/linux/rbtree_augmented.h

+3 −1
Original line number Diff line number Diff line
@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \ 
	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					\

};

lib/rbtree.c

+3 −1
Original line number Diff line number Diff line
@@ -427,7 +427,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {} 
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)