A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ion: don't call free_buffer_page on failure of ion_hyp_unassign_sg"

Browse source
This commit is contained in:
qctecmdr 2020-03-11 21:08:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit 106efff68e
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/android/ion/heaps/ion_system_heap.c
View file

@ -390,11 +390,13 @@ err_free_sg2:
buffer->private_flags |= ION_PRIV_FLAG_SHRINKER_FREE;
if (vmid > 0)
ion_hyp_unassign_sg(table, &vmid, 1, true);
if (ion_hyp_unassign_sg(table, &vmid, 1, true))
goto err_free_table_sync;
for_each_sg(table->sgl, sg, table->nents, i)
free_buffer_page(sys_heap, buffer, sg_page(sg),
get_order(sg->length));
err_free_table_sync:
if (nents_sync)
sg_free_table(&table_sync);
err_free_sg:

12
drivers/staging/android/ion/heaps/ion_system_secure_heap.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
*/
#include <linux/slab.h>
@ -120,7 +120,9 @@ static void process_one_prefetch(struct ion_heap *sys_heap,
goto out;
ret = ion_hyp_assign_sg(buffer.sg_table, &vmid, 1, true);
if (ret)
if (ret == -EADDRNOTAVAIL)
goto out1;
else if (ret < 0)
goto out;
/* Now free it to the secure heap */
@ -129,6 +131,12 @@ static void process_one_prefetch(struct ion_heap *sys_heap,
out:
sys_heap->ops->free(&buffer);
out1:
/*
* The security state of the pages is unknown after a failure;
* They can neither be added back to the secure pool nor buddy system.
*/
return;
}
/*