linux/drivers/staging/android, branch v5.1

staging: android: ashmem: Avoid range_alloc() allocation with ashmem_mutex held.

2019-02-26T10:50:17Z

ashmem_pin() is calling range_shrink() without checking whether range_alloc() succeeded. Also, doing memory allocation with ashmem_mutex held should be avoided because ashmem_shrink_scan() tries to hold it. Therefore, move memory allocation for range_alloc() to ashmem_pin_unpin() and make range_alloc() not to fail. This patch is mostly meant for backporting purpose for fuzz testing on stable/distributor kernels, for there is a plan to remove this code in near future. Signed-off-by: Tetsuo Handa Cc: stable@vger.kernel.org Reviewed-by: Joel Fernandes Signed-off-by: Greg Kroah-Hartman

staging: android: ashmem: Don't call fallocate() with ashmem_mutex held.

2019-02-19T10:28:43Z

syzbot is hitting lockdep warnings [1][2][3]. This patch tries to fix the warning by eliminating ashmem_shrink_scan() => {shmem|vfs}_fallocate() sequence. [1] https://syzkaller.appspot.com/bug?id=87c399f6fa6955006080b24142e2ce7680295ad4 [2] https://syzkaller.appspot.com/bug?id=7ebea492de7521048355fc84210220e1038a7908 [3] https://syzkaller.appspot.com/bug?id=e02419c12131c24e2a957ea050c2ab6dcbbc3270 Reported-by: syzbot Reported-by: syzbot Reported-by: syzbot Signed-off-by: Tetsuo Handa Cc: stable@vger.kernel.org Acked-by: Joel Fernandes (Google) Signed-off-by: Greg Kroah-Hartman

staging: android: ion: fix sys heap pool's gfp_flags

2019-02-19T10:12:08Z

In the first loop, gfp_flags will be modified to high_order_gfp_flags, and there will be no chance to change back to low_order_gfp_flags. Fixes: e7f63771b60e ("ION: Sys_heap: Add cached pool to spead up cached buffer alloc") Signed-off-by: Qing Xia Cc: stable Signed-off-by: Jing Xia Reviewed-by: Yuming Han Reviewed-by: Zhaoyang Huang Reviewed-by: Orson Zhai Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Add the GPL exception for syscalls

2019-02-14T09:47:20Z

Add "WITH Linux-syscall-note" to the license to not put GPL restrictions on user space programs using this header. Signed-off-by: Hyun Kwon Signed-off-by: Greg Kroah-Hartman

staging: android: formatting change in ashmem.c

2019-02-08T09:31:14Z

Resolved "Line over 80 characters" warning from checkpatch Signed-off-by: K Hodges Signed-off-by: Greg Kroah-Hartman

Merge 5.0-rc4 into staging-next

2019-01-28T07:17:02Z

We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Support cpu access during dma_buf_detach

2019-01-22T10:38:09Z

Often userspace doesn't know when the kernel will be calling dma_buf_detach on the buffer. If userpace starts its CPU access at the same time as the sg list is being freed it could end up accessing the sg list after it has been freed. Thread A Thread B - DMA_BUF_IOCTL_SYNC IOCT - ion_dma_buf_begin_cpu_access - list_for_each_entry - ion_dma_buf_detatch - free_duped_table - dma_sync_sg_for_cpu Fix this by getting the ion_buffer lock before freeing the sg table memory. Fixes: 2a55e7b5e544 ("staging: android: ion: Call dma_map_sg for syncing and mapping") Signed-off-by: Liam Mark Acked-by: Laura Abbott Acked-by: Andrew F. Davis Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Remove unused headers

2019-01-18T09:46:18Z

Various cleanups have removed the use of some headers in ION, remove these here. Signed-off-by: Andrew F. Davis Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Remove base from ion_chunk_heap

2019-01-18T09:46:18Z

The base address is not used anywhere and tracked by the pool allocator. No need to store this anymore. Signed-off-by: Andrew F. Davis Signed-off-by: Greg Kroah-Hartman

staging: android: ion: Remove base from ion_carveout_heap

2019-01-18T09:46:18Z

The base address is not used anywhere and tracked by the pool allocator. No need to store this anymore. Signed-off-by: Andrew F. Davis Signed-off-by: Greg Kroah-Hartman