diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2012-12-03 11:43:49 -0800 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2013-07-01 14:16:14 -0700 |
| commit | e4893092cf9b2e1d764ebed00ef3e1a0646c054c (patch) | |
| tree | 8547e05bca72598d0398398c62ce2d8deacc3a00 /drivers | |
| parent | b1a39c5c2a6794263988331dab535b37a1acfbb1 (diff) | |
| download | olio-linux-3.10-e4893092cf9b2e1d764ebed00ef3e1a0646c054c.tar.xz olio-linux-3.10-e4893092cf9b2e1d764ebed00ef3e1a0646c054c.zip | |
gpu: ion: Fix bug in zeroing pages in system heap
Pages are zeroed for security purposes when returned to the
ion heap. There was a bug in this code preventing this
from happening.
Bug: 7573871
Change-Id: I79c22ee1da98f306199f3a192eaec4e81d5fd059
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/ion/ion_system_heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/ion/ion_system_heap.c b/drivers/gpu/ion/ion_system_heap.c index dfa9543ab79..2a85df9ef89 100644 --- a/drivers/gpu/ion/ion_system_heap.c +++ b/drivers/gpu/ion/ion_system_heap.c @@ -103,7 +103,7 @@ static void free_buffer_page(struct ion_system_heap *heap, security. This uses vmap as we want to set the pgprot so the writes to occur to noncached mappings, as the pool's purpose is to keep the pages out of the cache */ - for (i = 0; i < order / PAGE_SIZE; i++) { + for (i = 0; i < (1 << order); i++) { struct page *sub_page = page + i; void *addr = vmap(&sub_page, 1, VM_MAP, pgprot_writecombine(PAGE_KERNEL)); |