Commit e1478d8e authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

asm-generic: Refactor dereference_[kernel]_function_descriptor() 



dereference_function_descriptor() and
dereference_kernel_function_descriptor() are identical on the
three architectures implementing them.

Make them common and put them out-of-line in kernel/extable.c
which is one of the users and has similar type of functions.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/449db09b2eba57f4ab05f80102a67d8675bc8bcd.1644928018.git.christophe.leroy@csgroup.eu
parent 0dc690e4

arch/ia64/include/asm/sections.h

+0 −19
Original line number Diff line number Diff line
@@ -30,23 +30,4 @@ extern char __start_gate_brl_fsys_bubble_down_patchlist[], __end_gate_brl_fsys_b 
extern char __start_unwind[], __end_unwind[];

extern char __start_ivt_text[], __end_ivt_text[];



#undef dereference_function_descriptor

static inline void *dereference_function_descriptor(void *ptr)

{

	struct fdesc *desc = ptr;

	void *p;



	if (!get_kernel_nofault(p, (void *)&desc->addr))

		ptr = p;

	return ptr;

}



#undef dereference_kernel_function_descriptor

static inline void *dereference_kernel_function_descriptor(void *ptr)

{

	if (ptr < (void *)__start_opd || ptr >= (void *)__end_opd)

		return ptr;

	return dereference_function_descriptor(ptr);

}



#endif /* _ASM_IA64_SECTIONS_H */

arch/parisc/include/asm/sections.h

+0 −9
Original line number Diff line number Diff line
@@ -12,13 +12,4 @@ typedef Elf64_Fdesc func_desc_t; 


extern char __alt_instructions[], __alt_instructions_end[];



#ifdef CONFIG_64BIT



#undef dereference_function_descriptor

void *dereference_function_descriptor(void *);



#undef dereference_kernel_function_descriptor

void *dereference_kernel_function_descriptor(void *);

#endif



#endif

arch/parisc/kernel/process.c

+0 −21
Original line number Diff line number Diff line
@@ -263,27 +263,6 @@ __get_wchan(struct task_struct *p) 
	return 0;

}



#ifdef CONFIG_64BIT

void *dereference_function_descriptor(void *ptr)

{

	Elf64_Fdesc *desc = ptr;

	void *p;



	if (!get_kernel_nofault(p, (void *)&desc->addr))

		ptr = p;

	return ptr;

}



void *dereference_kernel_function_descriptor(void *ptr)

{

	if (ptr < (void *)__start_opd ||

			ptr >= (void *)__end_opd)

		return ptr;



	return dereference_function_descriptor(ptr);

}

#endif



static inline unsigned long brk_rnd(void)

{

	return (get_random_int() & BRK_RND_MASK) << PAGE_SHIFT;

arch/powerpc/include/asm/sections.h

+0 −23
Original line number Diff line number Diff line
@@ -58,29 +58,6 @@ static inline int overlaps_kernel_text(unsigned long start, unsigned long end) 
		(unsigned long)_stext < end;

}



#ifdef PPC64_ELF_ABI_v1



#undef dereference_function_descriptor

static inline void *dereference_function_descriptor(void *ptr)

{

	struct func_desc *desc = ptr;

	void *p;



	if (!get_kernel_nofault(p, (void *)&desc->addr))

		ptr = p;

	return ptr;

}



#undef dereference_kernel_function_descriptor

static inline void *dereference_kernel_function_descriptor(void *ptr)

{

	if (ptr < (void *)__start_opd || ptr >= (void *)__end_opd)

		return ptr;



	return dereference_function_descriptor(ptr);

}

#endif /* PPC64_ELF_ABI_v1 */



#endif



#endif /* __KERNEL__ */

include/asm-generic/sections.h

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ extern __visible const void __nosave_begin, __nosave_end; 


/* Function descriptor handling (if any).  Override in asm/sections.h */

#ifdef CONFIG_HAVE_FUNCTION_DESCRIPTORS

void *dereference_function_descriptor(void *ptr);

void *dereference_kernel_function_descriptor(void *ptr);

#else

#define dereference_function_descriptor(p) ((void *)(p))

#define dereference_kernel_function_descriptor(p) ((void *)(p))