[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20091025162018.GB20391@elte.hu>
Date: Sun, 25 Oct 2009 17:20:18 +0100
From: Ingo Molnar <mingo@...e.hu>
To: Jiri Slaby <jirislaby@...il.com>
Cc: mingo@...hat.com, tglx@...utronix.de, hpa@...or.com,
x86@...nel.org, linux-kernel@...r.kernel.org,
Vivek Goyal <vgoyal@...hat.com>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
Simon Horman <horms@...ge.net.au>,
Paul Mundt <lethal@...ux-sh.org>
Subject: Re: [PATCH 1/1] crash_dump: fix non-pae kdump kernel memory
accesses
* Jiri Slaby <jirislaby@...il.com> wrote:
> Non-PAE 32-bit dump kernels may wrap an address around 4G and
> poke unwanted space. ptes there are 32-bit long, and since
> pfn << PAGE_SIZE may exceed this limit, high pfn bits are cropped
> and wrong address mapped by kmap_atomic_pfn in copy_oldmem_page.
>
> Don't allow this behavior in non-PAE kdump kernels by checking
> pfns passed into copy_oldmem_page. In the case of failure,
> userspace process gets EFAULT.
>
> Signed-off-by: Jiri Slaby <jirislaby@...il.com>
> Cc: Vivek Goyal <vgoyal@...hat.com>
> Cc: "Eric W. Biederman" <ebiederm@...ssion.com>
> Cc: Simon Horman <horms@...ge.net.au>
> Cc: Paul Mundt <lethal@...ux-sh.org>
> Cc: Ingo Molnar <mingo@...e.hu>
> ---
> arch/x86/kernel/crash_dump_32.c | 16 ++++++++++++++++
> 1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c
> index f7cdb3b..b78dab8 100644
> --- a/arch/x86/kernel/crash_dump_32.c
> +++ b/arch/x86/kernel/crash_dump_32.c
> @@ -16,6 +16,19 @@ static void *kdump_buf_page;
> /* Stores the physical address of elf header of crash image. */
> unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
>
> +#ifndef CONFIG_X86_PAE
> +/* non-PAE kdump kernel executed from a PAE one will crop high pte bits and
> + poke unwanted space counting again from address 0, we don't want that */
> +static inline bool is_crashed_pfn_valid(unsigned long pfn)
> +{
> + /* on non-PAE pte must fit into unsigned long
> + in fact the test is (pfn & 0x000fffff) */
> + return pte_pfn(pfn_pte(pfn, __pgprot(0))) == pfn;
> +}
> +#else
> +static inline bool is_crashed_pfn_valid(unsigned long pfn) { return true; }
> +#endif
i'd suggest to push the #ifdef inside the function.
Also, please use the customary (multi-line) comment style:
/*
* Comment .....
* ...... goes here.
*/
specified in Documentation/CodingStyle.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists