diff mbox series

[v2] ARM: dma-mapping: always clear allocated buffers

Message ID 20180725070706.19576-1-yuehaibing@huawei.com (mailing list archive)
State New, archived
Headers show
Series [v2] ARM: dma-mapping: always clear allocated buffers | expand

Commit Message

Yue Haibing July 25, 2018, 7:07 a.m. UTC
Sean Wang reported dma_zalloc_coherent doesn't work as expect on his
armv7,the allocated mem is not zeroed.The reason is __alloc_from_pool
doesn't honor __GFP_ZERO.

As commit 6829e274a623 ("arm64: dma-mapping: always clear allocated buffers")
has pointed out,buffers allocated by dma_alloc_coherent() are always zeroed
on most architectures. some drivers rely on this 'feature'. Allocated buffer
might be also exposed to userspace with dma_mmap() call,so clearing it is
desired from security point of view to avoid exposing random memory to userspace.

This patch unifies dma_alloc_coherent() behavior on ARM architecture with other
implementations by unconditionally zeroing allocated buffer.Also to fix
dma_zalloc_coherent behavior.

Reported-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: zhong jiang <zhongjiang@huawei.com>
---
v2: reference more argument from arm64 commit as Christoph suggested
---
 arch/arm/mm/dma-mapping.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Yue Haibing July 25, 2018, 7:13 a.m. UTC | #1
+CC  Christoph Hellwig <hch@infradead.org>

On 2018/7/25 15:07, YueHaibing wrote:
> Sean Wang reported dma_zalloc_coherent doesn't work as expect on his
> armv7,the allocated mem is not zeroed.The reason is __alloc_from_pool
> doesn't honor __GFP_ZERO.
> 
> As commit 6829e274a623 ("arm64: dma-mapping: always clear allocated buffers")
> has pointed out,buffers allocated by dma_alloc_coherent() are always zeroed
> on most architectures. some drivers rely on this 'feature'. Allocated buffer
> might be also exposed to userspace with dma_mmap() call,so clearing it is
> desired from security point of view to avoid exposing random memory to userspace.
> 
> This patch unifies dma_alloc_coherent() behavior on ARM architecture with other
> implementations by unconditionally zeroing allocated buffer.Also to fix
> dma_zalloc_coherent behavior.
> 
> Reported-by: Sean Wang <sean.wang@mediatek.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> Reviewed-by: zhong jiang <zhongjiang@huawei.com>
> ---
> v2: reference more argument from arm64 commit as Christoph suggested
> ---
>  arch/arm/mm/dma-mapping.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 6656647..cf5882f 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -564,6 +564,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
>  
>  		*ret_page = phys_to_page(phys);
>  		ptr = (void *)val;
> +		memset(ptr, 0, size);
>  	}
>  
>  	return ptr;
>
Yue Haibing Aug. 22, 2018, 1:47 a.m. UTC | #2
Russell, will you pick this patch?

On 2018/7/25 15:13, YueHaibing wrote:
> +CC  Christoph Hellwig <hch@infradead.org>
> 
> On 2018/7/25 15:07, YueHaibing wrote:
>> Sean Wang reported dma_zalloc_coherent doesn't work as expect on his
>> armv7,the allocated mem is not zeroed.The reason is __alloc_from_pool
>> doesn't honor __GFP_ZERO.
>>
>> As commit 6829e274a623 ("arm64: dma-mapping: always clear allocated buffers")
>> has pointed out,buffers allocated by dma_alloc_coherent() are always zeroed
>> on most architectures. some drivers rely on this 'feature'. Allocated buffer
>> might be also exposed to userspace with dma_mmap() call,so clearing it is
>> desired from security point of view to avoid exposing random memory to userspace.
>>
>> This patch unifies dma_alloc_coherent() behavior on ARM architecture with other
>> implementations by unconditionally zeroing allocated buffer.Also to fix
>> dma_zalloc_coherent behavior.
>>
>> Reported-by: Sean Wang <sean.wang@mediatek.com>
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> Reviewed-by: zhong jiang <zhongjiang@huawei.com>
>> ---
>> v2: reference more argument from arm64 commit as Christoph suggested
>> ---
>>  arch/arm/mm/dma-mapping.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
>> index 6656647..cf5882f 100644
>> --- a/arch/arm/mm/dma-mapping.c
>> +++ b/arch/arm/mm/dma-mapping.c
>> @@ -564,6 +564,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
>>  
>>  		*ret_page = phys_to_page(phys);
>>  		ptr = (void *)val;
>> +		memset(ptr, 0, size);
>>  	}
>>  
>>  	return ptr;
>>
Yue Haibing Sept. 15, 2018, 11:29 a.m. UTC | #3
Ping.

On 2018/7/25 15:07, YueHaibing wrote:
> Sean Wang reported dma_zalloc_coherent doesn't work as expect on his
> armv7,the allocated mem is not zeroed.The reason is __alloc_from_pool
> doesn't honor __GFP_ZERO.
> 
> As commit 6829e274a623 ("arm64: dma-mapping: always clear allocated buffers")
> has pointed out,buffers allocated by dma_alloc_coherent() are always zeroed
> on most architectures. some drivers rely on this 'feature'. Allocated buffer
> might be also exposed to userspace with dma_mmap() call,so clearing it is
> desired from security point of view to avoid exposing random memory to userspace.
> 
> This patch unifies dma_alloc_coherent() behavior on ARM architecture with other
> implementations by unconditionally zeroing allocated buffer.Also to fix
> dma_zalloc_coherent behavior.
> 
> Reported-by: Sean Wang <sean.wang@mediatek.com>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> Reviewed-by: zhong jiang <zhongjiang@huawei.com>
> ---
> v2: reference more argument from arm64 commit as Christoph suggested
> ---
>  arch/arm/mm/dma-mapping.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index 6656647..cf5882f 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -564,6 +564,7 @@ static void *__alloc_from_pool(size_t size, struct page **ret_page)
>  
>  		*ret_page = phys_to_page(phys);
>  		ptr = (void *)val;
> +		memset(ptr, 0, size);
>  	}
>  
>  	return ptr;
>
diff mbox series

Patch

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 6656647..cf5882f 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -564,6 +564,7 @@  static void *__alloc_from_pool(size_t size, struct page **ret_page)
 
 		*ret_page = phys_to_page(phys);
 		ptr = (void *)val;
+		memset(ptr, 0, size);
 	}
 
 	return ptr;