x86: fix text_poke()
authorJiri Slaby <jirislaby@gmail.com>
Mon, 28 Apr 2008 00:51:23 +0000 (02:51 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 25 Apr 2008 17:54:07 +0000 (19:54 +0200)
kernel_text_address returns true even for modules which is not wanted
in text_poke. Use core_kernel_text instead.

This is a regression introduced in e587cadd8f47e202a30712e2906a65a0606d5865
which caused occasionaly crashes after suspend/resume.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
CC: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
CC: Andi Kleen <andi@firstfloor.org>
CC: pageexec@freemail.hu
CC: H. Peter Anvin <hpa@zytor.com>
CC: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/alternative.c

index df4099dc1c682eb4af7c4af22badf4e4f3cd770c..7ab3a9774763b35d3ce866083c04f22a0c6d3b47 100644 (file)
@@ -515,7 +515,7 @@ void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
        BUG_ON(len > sizeof(long));
        BUG_ON((((long)addr + len - 1) & ~(sizeof(long) - 1))
                - ((long)addr & ~(sizeof(long) - 1)));
-       if (kernel_text_address((unsigned long)addr)) {
+       if (core_kernel_text((unsigned long)addr)) {
                struct page *pages[2] = { virt_to_page(addr),
                        virt_to_page(addr + PAGE_SIZE) };
                if (!pages[1])