Commit 310ec038 authored by Barry Song's avatar Barry Song Committed by Sumit Semwal
Browse files

dma-buf: align fd_flags and heap_flags with dma_heap_allocation_data 



dma_heap_allocation_data defines the UAPI as follows:

 struct dma_heap_allocation_data {
 	__u64 len;
 	__u32 fd;
 	__u32 fd_flags;
 	__u64 heap_flags;
 };

However, dma_heap_buffer_alloc() casts both fd_flags and heap_flags
into unsigned int. We're inconsistent with types in the non UAPI
arguments. This patch fixes it.

Signed-off-by: default avatarBarry Song <v-songbaohua@oppo.com>
Acked-by: default avatarJohn Stultz <jstultz@google.com>
Signed-off-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240605012605.5341-1-21cnbao@gmail.com
parent 9c3951ec

drivers/dma-buf/dma-heap.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ static struct class *dma_heap_class; 
static DEFINE_XARRAY_ALLOC(dma_heap_minors);



static int dma_heap_buffer_alloc(struct dma_heap *heap, size_t len,

				 unsigned int fd_flags,

				 unsigned int heap_flags)

				 u32 fd_flags,

				 u64 heap_flags)

{

	struct dma_buf *dmabuf;

	int fd;

include/uapi/linux/dma-heap.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE)



/* Currently no heap flags */

#define DMA_HEAP_VALID_HEAP_FLAGS (0)

#define DMA_HEAP_VALID_HEAP_FLAGS (0ULL)



/**

 * struct dma_heap_allocation_data - metadata passed from userspace for