linux-kernel - Re: [PATCH] x86: dma-mapping: fix broken allocation when dma

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <op.wft0brk93l0zgt@mpn-glaptop>
Date:	Wed, 13 Jun 2012 09:56:05 +0200
From:	"Michal Nazarewicz" <mina86@...a86.com>
To:	x86@...nel.org, linux-kernel@...r.kernel.org,
	"Marek Szyprowski" <m.szyprowski@...sung.com>
Cc:	"Kyungmin Park" <kyungmin.park@...sung.com>,
	"Thomas Gleixner" <tglx@...utronix.de>,
	"Konrad Rzeszutek Wilk" <konrad@...nok.org>,
	"Arnd Bergmann" <arnd@...db.de>
Subject: Re: [PATCH] x86: dma-mapping: fix broken allocation when dma_mask has
 been provided

On Wed, 13 Jun 2012 07:57:26 +0200, Marek Szyprowski <m.szyprowski@...sung.com> wrote:

> Commit 0a2b9a6ea93 ("X86: integrate CMA with DMA-mapping subsystem")
> broke memory allocation with dma_mask. This patch fixes possible kernel
> ops caused by lack of resetting page variable when jumping to 'again' label.
>
> Reported-by: Konrad Rzeszutek Wilk <konrad@...nok.org>
> Signed-off-by: Marek Szyprowski <m.szyprowski@...sung.com>

Acked-by: Michal Nazarewicz <mina86@...a86.com>

> ---
>  arch/x86/kernel/pci-dma.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
> index 62c9457..c0f420f 100644
> --- a/arch/x86/kernel/pci-dma.c
> +++ b/arch/x86/kernel/pci-dma.c
> @@ -100,7 +100,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
>  				 struct dma_attrs *attrs)
>  {
>  	unsigned long dma_mask;
> -	struct page *page = NULL;
> +	struct page *page;
>  	unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
>  	dma_addr_t addr;
>@@ -108,6 +108,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
> 	flag |= __GFP_ZERO;
>  again:
> +	page = NULL;
>  	if (!(flag & GFP_ATOMIC))
>  		page = dma_alloc_from_contiguous(dev, count, get_order(size));
>  	if (!page)


-- 
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz    (o o)
ooo +----<email/xmpp: mpn@...gle.com>--------------ooO--(_)--Ooo--
--
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/