Skip to contentSkip to conversation

staging: android: ion: Zero CMA allocated memory

PATCH Superseded Liam Mark 2 participants 3 messages Jan 22, 2018 – Jan 25, 2018 Staging

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Liam Mark

author
#0 lore raw

PATCH v2 1/1 staging: android: ion: Zero CMA allocated memory

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

 drivers/staging/android/ion/ion_cma_heap.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +2 -0
index 86196ffd2faf..91a98785607a 100644
@@ -51,6 +51,8 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
 	if (!pages)
 		return -ENOMEM;
 
+	memset(page_address(pages), 0, size);
+
 	table = kmalloc(sizeof(*table), GFP_KERNEL);
 	if (!table)
 		goto err;
Signature · 5 lines
1.8.5.2


Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw
Quoted 22 lines · Liam Mark

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

  drivers/staging/android/ion/ion_cma_heap.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +0 -0
index 86196ffd2faf..91a98785607a 100644

drivers/staging/android/ion/ion_cma_heap.c static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, · line 55

Quoted 5 lines
drivers/staging/android/ion/ion_cma_heap.c +2 -0
@@ -51,6 +51,8 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer,
  	if (!pages)
  		return -ENOMEM;
 
+	memset(page_address(pages), 0, size);
+

This won't work for highmem pages. You need to zero by page via kmap_atomic in that case. You can use PageHighMem to separate the paths.

Thanks,
Laura

drivers/staging/android/ion/ion_cma_heap.c static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, · line 58

Quoted 4 lines
drivers/staging/android/ion/ion_cma_heap.c +0 -0
  	table = kmalloc(sizeof(*table), GFP_KERNEL);
  	if (!table)
  		goto err;

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

author
#2 lore raw
Quoted 28 lines · Laura Abbott
Quoted 27 lines · Liam Mark

Since commit 204f672255c2 ("staging: android: ion: Use CMA APIs directly") the CMA API is now used directly and therefore the allocated memory is no longer automatically zeroed.

Explicitly zero CMA allocated memory to ensure that no data is exposed to userspace.

Fixes 204f672255c2 ("staging: android: ion: Use CMA APIs directly")

---
Changes in v2:
- Clean up the commit message.
- Add 'Fixes:'

  drivers/staging/android/ion/ion_cma_heap.c | 2 ++
  1 file changed, 2 insertions(+)
drivers/staging/android/ion/ion_cma_heap.c +0 -0
index 86196ffd2faf..91a98785607a 100644
@@ -51,6 +51,8 @@ static int ion_cma_allocate(struct ion_heap *heap, struct
 ion_buffer *buffer,
  	if (!pages)
  		return -ENOMEM;
 
Quoted 6 lines

drivers/staging/android/ion/ion_cma_heap.c static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, · line 55

Quoted 2 lines
drivers/staging/android/ion/ion_cma_heap.c +2 -0
+	memset(page_address(pages), 0, size);
+

This won't work for highmem pages. You need to zero by page via kmap_atomic in that case. You can use PageHighMem to separate the paths.

Thanks for catching that, I will update the patch.

Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel