linux-stable.git/drivers/staging/android/ion, branch v4.17.2

staging: android: ion: Switch to pr_warn_once in ion_buffer_destroy

2018-06-16T07:18:20+00:00

commit 45ad559a29629cb1c64ee636563c69b71524f077 upstream.

Syzbot reported yet another warning with Ion:

WARNING: CPU: 0 PID: 1467 at drivers/staging/android/ion/ion.c:122
ion_buffer_destroy+0xd4/0x190 drivers/staging/android/ion/ion.c:122
Kernel panic - not syncing: panic_on_warn set ...

This is catching that a buffer was freed with an existing kernel mapping
still present. This can be easily be triggered from userspace by calling
DMA_BUF_SYNC_START without calling DMA_BUF_SYNC_END. Switch to a single
pr_warn_once to indicate the error without being disruptive.

Reported-by: syzbot+cd8bcd40cb049efa2770@syzkaller.appspotmail.com
Reported-by: syzbot 
Signed-off-by: Laura Abbott 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Update wording in drivers/staging/android/ion/Kconfig

2018-03-19T18:43:24+00:00

Changes the usage of the word 'Chose' to 'Choose' in the ION
Memory Manager Kconfig.

Signed-off-by: Phillip Potter 
Acked-by: Laura Abbott 
Signed-off-by: Greg Kroah-Hartman

Merge 4.16-rc3 into staging-next

2018-02-26T14:32:00+00:00

We want the IIO/Staging fixes in here, and to resolve a merge problem
with the move of the fsl-mc code.

Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Remove check of idev->debug_root

2018-02-22T13:53:05+00:00

We will go on initial idev if failed to create debug_root, and it does
not matter to check the return value of this debugfs call, just remove it.

Signed-off-by: Yisheng Xie 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Remove check of debug_file

2018-02-22T13:53:05+00:00

There's no need to check the return value of debug_file for it is just a
debugfs and we will go on the following process if we failed to create
debug_file. So just remove it.

Signed-off-by: Yisheng Xie 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Initialize dma_address of new sg list

2018-02-20T08:05:35+00:00

Fix the dup_sg_table function to initialize the dma_address of the new
sg list entries instead of the source dma_address entries.

Since ION duplicates the sg_list this issue does not appear to result in
an actual bug.

Signed-off-by: Liam Mark 
Acked-by: Laura Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Zero CMA allocated memory

2018-02-16T16:50:09+00:00

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")
Signed-off-by: Liam Mark 
Acked-by: Laura Abbott 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Combine cache and uncache pools

2018-02-16T16:29:07+00:00

Now we call dma_map in the dma_buf API callbacks and handle explicit
caching by the dma_buf sync API, which make cache and uncache pools
in the same handling flow, which can be combined.

Acked-by: Sumit Semwal 
Signed-off-by: Yisheng Xie 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Cleanup ion_page_pool_alloc_pages

2018-02-16T16:29:07+00:00

ion_page_pool_alloc_pages calls alloc_pages to allocate pages for page
pools. If alloc_pages return NULL, it will return NULL, or it will
return the pages allocate from alloc_pages. So we can just return
alloc_pages without any judgement.

Acked-by: Sumit Semwal 
Signed-off-by: Yisheng Xie 
Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Return void instead of int

2018-02-16T16:29:07+00:00

Now, nobody care about the return value of ion_page_pool_add, therefore
we can just make it return void.

Acked-by: Laura Abbott 
Signed-off-by: Yisheng Xie 
Signed-off-by: Greg Kroah-Hartman