aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Mark <lmark@codeaurora.org>2016-10-12 14:22:56 -0700
committerAndreas Blaesius <skate4life@gmx.de>2017-03-17 11:02:03 +0100
commit69dc2da8e512692e0268ad1bc665472770e1e4cf (patch)
tree8c1522d6b5b8f6d52744bf7d032a6febbba8bef9
parent75ca7ce6cc51ae5f60efe1f3716cba86c8540b6d (diff)
downloadkernel_samsung_espresso10-69dc2da8e512692e0268ad1bc665472770e1e4cf.tar.gz
kernel_samsung_espresso10-69dc2da8e512692e0268ad1bc665472770e1e4cf.tar.bz2
kernel_samsung_espresso10-69dc2da8e512692e0268ad1bc665472770e1e4cf.zip
ion: disable system contig heap
A malicious application can take advantage of the ION contig heap to create a specific memory chunk size to exercise a rowhammer attack on the physical hardware. So remove support for the ION contig heap. Change-Id: I9cb454cebb74df291479cecc3533d2c684363f77 Signed-off-by: Liam Mark <lmark@codeaurora.org> Signed-off-by: Prakash Gupta <guptap@codeaurora.org>
-rw-r--r--drivers/gpu/ion/ion_heap.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c
index 8ce3c1907ba..3d0f5cbe389 100644
--- a/drivers/gpu/ion/ion_heap.c
+++ b/drivers/gpu/ion/ion_heap.c
@@ -24,8 +24,9 @@ struct ion_heap *ion_heap_create(struct ion_platform_heap *heap_data)
switch (heap_data->type) {
case ION_HEAP_TYPE_SYSTEM_CONTIG:
- heap = ion_system_contig_heap_create(heap_data);
- break;
+ pr_err("%s: Heap type is disabled: %d\n", __func__,
+ heap_data->type);
+ return ERR_PTR(-EINVAL);
case ION_HEAP_TYPE_SYSTEM:
heap = ion_system_heap_create(heap_data);
break;
@@ -57,7 +58,8 @@ void ion_heap_destroy(struct ion_heap *heap)
switch (heap->type) {
case ION_HEAP_TYPE_SYSTEM_CONTIG:
- ion_system_contig_heap_destroy(heap);
+ pr_err("%s: Heap type is disabled: %d\n", __func__,
+ heap->type);
break;
case ION_HEAP_TYPE_SYSTEM:
ion_system_heap_destroy(heap);