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

Commit 8162b3d1 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

kprobes/x86: Remove unneeded arch_within_kprobe_blacklist from x86 



Remove x86 specific arch_within_kprobe_blacklist().

Since we have already added all blacklisted symbols to the
kprobe blacklist by arch_populate_kprobe_blacklist(),
we don't need arch_within_kprobe_blacklist() on x86
anymore.

Tested-by: default avatarAndrea Righi <righi.andrea@gmail.com>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yonghong Song <yhs@fb.com>
Link: http://lkml.kernel.org/r/154503491354.26176.13903264647254766066.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent fe6e6561

arch/x86/kernel/kprobes/core.c

+0 −8
Original line number Diff line number Diff line
@@ -1026,14 +1026,6 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr) 
}

NOKPROBE_SYMBOL(kprobe_fault_handler);



bool arch_within_kprobe_blacklist(unsigned long addr)

{

	return  (addr >= (unsigned long)__kprobes_text_start &&

		 addr < (unsigned long)__kprobes_text_end) ||

		(addr >= (unsigned long)__entry_text_start &&

		 addr < (unsigned long)__entry_text_end);

}



int __init arch_populate_kprobe_blacklist(void)

{

	return kprobe_add_area_blacklist((unsigned long)__entry_text_start,