From 3159ceca97644711a45a90c6ab0e7b0dad37ae03 Mon Sep 17 00:00:00 2001 From: Doug Moore Date: Fri, 12 Jun 2020 16:51:55 +0000 Subject: [PATCH] The linuxkpi code accesses left/right rb tree pointers without using RB_LEFT or RB_RIGHT, so they aren't stripping off the color bit encoded there. Strip off that bit for linuxkpi. Reported by: dch Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D25245 --- sys/compat/linuxkpi/common/include/linux/rbtree.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h index 8dc63fc799ed..4e7a55e07a4d 100644 --- a/sys/compat/linuxkpi/common/include/linux/rbtree.h +++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h @@ -37,8 +37,8 @@ struct rb_node { RB_ENTRY(rb_node) __entry; }; -#define rb_left __entry.rbe_left -#define rb_right __entry.rbe_right +#define rb_left RB_PTR(__entry.rbe_left) +#define rb_right RB_PTR(__entry.rbe_right) /* * We provide a false structure that has the same bit pattern as tree.h