mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-11 08:54:28 -05:00
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From 0ea1ec713f04bdfac343c9702b21cd3a7c711826 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Russell King <rmk+kernel@arm.linux.org.uk>
|
||
|
|
Date: Wed, 23 Oct 2013 16:14:59 +0100
|
||
|
|
Subject: [PATCH] ARM: dma-mapping: don't allow DMA mappings to be marked
|
||
|
|
executable
|
||
|
|
|
||
|
|
DMA mapping permissions were being derived from pgprot_kernel directly
|
||
|
|
without using PAGE_KERNEL. This causes them to be marked with executable
|
||
|
|
permission, which is not what we want. Fix this.
|
||
|
|
|
||
|
|
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
||
|
|
---
|
||
|
|
arch/arm/mm/dma-mapping.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
|
||
|
|
index f5e1a8471714c..57438506d5246 100644
|
||
|
|
--- a/arch/arm/mm/dma-mapping.c
|
||
|
|
+++ b/arch/arm/mm/dma-mapping.c
|
||
|
|
@@ -687,7 +687,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
||
|
|
void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
||
|
|
gfp_t gfp, struct dma_attrs *attrs)
|
||
|
|
{
|
||
|
|
- pgprot_t prot = __get_dma_pgprot(attrs, pgprot_kernel);
|
||
|
|
+ pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
|
||
|
|
void *memory;
|
||
|
|
|
||
|
|
if (dma_alloc_from_coherent(dev, size, handle, &memory))
|
||
|
|
@@ -700,7 +700,7 @@ void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
|
||
|
|
static void *arm_coherent_dma_alloc(struct device *dev, size_t size,
|
||
|
|
dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)
|
||
|
|
{
|
||
|
|
- pgprot_t prot = __get_dma_pgprot(attrs, pgprot_kernel);
|
||
|
|
+ pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
|
||
|
|
void *memory;
|
||
|
|
|
||
|
|
if (dma_alloc_from_coherent(dev, size, handle, &memory))
|