Commit f9e62f31 authored by Stephen Boyd's avatar Stephen Boyd Committed by Thomas Gleixner
Browse files

treewide: Make all debug_obj_descriptors const 



This should make it harder for the kernel to corrupt the debug object
descriptor, used to call functions to fixup state and track debug objects,
by moving the structure to read-only memory.

Signed-off-by: default avatarStephen Boyd <swboyd@chromium.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20200815004027.2046113-3-swboyd@chromium.org
parent aedcade6

drivers/gpu/drm/i915/i915_active.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void *active_debug_hint(void *addr) 
	return (void *)ref->active ?: (void *)ref->retire ?: (void *)ref;

}



static struct debug_obj_descr active_debug_desc = {

static const struct debug_obj_descr active_debug_desc = {

	.name = "i915_active",

	.debug_hint = active_debug_hint,

};

drivers/gpu/drm/i915/i915_sw_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static void *i915_sw_fence_debug_hint(void *addr) 


#ifdef CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS



static struct debug_obj_descr i915_sw_fence_debug_descr = {

static const struct debug_obj_descr i915_sw_fence_debug_descr = {

	.name = "i915_sw_fence",

	.debug_hint = i915_sw_fence_debug_hint,

};

kernel/rcu/rcu.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static inline unsigned long rcu_seq_diff(unsigned long new, unsigned long old) 
# define STATE_RCU_HEAD_READY	0

# define STATE_RCU_HEAD_QUEUED	1



extern struct debug_obj_descr rcuhead_debug_descr;

extern const struct debug_obj_descr rcuhead_debug_descr;



static inline int debug_rcu_head_queue(struct rcu_head *head)

{

kernel/rcu/update.c

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ void destroy_rcu_head_on_stack(struct rcu_head *head) 
}

EXPORT_SYMBOL_GPL(destroy_rcu_head_on_stack);



struct debug_obj_descr rcuhead_debug_descr = {

const struct debug_obj_descr rcuhead_debug_descr = {

	.name = "rcu_head",

	.is_static_object = rcuhead_is_static_object,

};

kernel/time/hrtimer.c

+2 −2
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ EXPORT_SYMBOL_GPL(ktime_add_safe); 


#ifdef CONFIG_DEBUG_OBJECTS_TIMERS



static struct debug_obj_descr hrtimer_debug_descr;

static const struct debug_obj_descr hrtimer_debug_descr;



static void *hrtimer_debug_hint(void *addr)

{
@@ -401,7 +401,7 @@ static bool hrtimer_fixup_free(void *addr, enum debug_obj_state state) 
	}

}



static struct debug_obj_descr hrtimer_debug_descr = {

static const struct debug_obj_descr hrtimer_debug_descr = {

	.name		= "hrtimer",

	.debug_hint	= hrtimer_debug_hint,

	.fixup_init	= hrtimer_fixup_init,

CRA Git | Maintained and supported by SUSTech CRA and CCSE