Skip to content

Commit 7c3e9fc

Browse files
jerome-pouillerChristianKoenigAMD
authored andcommitted
dma-buf: fix use of DMA_BUF_SET_NAME_{A,B} in userspace
The typedefs u32 and u64 are not available in userspace. Thus user get an error he try to use DMA_BUF_SET_NAME_A or DMA_BUF_SET_NAME_B: $ gcc -Wall -c -MMD -c -o ioctls_list.o ioctls_list.c In file included from /usr/include/x86_64-linux-gnu/asm/ioctl.h:1, from /usr/include/linux/ioctl.h:5, from /usr/include/asm-generic/ioctls.h:5, from ioctls_list.c:11: ioctls_list.c:463:29: error: ‘u32’ undeclared here (not in a function) 463 | { "DMA_BUF_SET_NAME_A", DMA_BUF_SET_NAME_A, -1, -1 }, // linux/dma-buf.h | ^~~~~~~~~~~~~~~~~~ ioctls_list.c:464:29: error: ‘u64’ undeclared here (not in a function) 464 | { "DMA_BUF_SET_NAME_B", DMA_BUF_SET_NAME_B, -1, -1 }, // linux/dma-buf.h | ^~~~~~~~~~~~~~~~~~ The issue was initially reported here[1]. [1]: jerome-pouiller/ioctl#14 Signed-off-by: Jérôme Pouiller <[email protected]> Reviewed-by: Christian König <[email protected]> Fixes: a5bff92 ("dma-buf: Fix SET_NAME ioctl uapi") CC: [email protected] Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Christian König <[email protected]>
1 parent 370704e commit 7c3e9fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/uapi/linux/dma-buf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ struct dma_buf_sync {
9292
* between them in actual uapi, they're just different numbers.
9393
*/
9494
#define DMA_BUF_SET_NAME _IOW(DMA_BUF_BASE, 1, const char *)
95-
#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, u32)
96-
#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, u64)
95+
#define DMA_BUF_SET_NAME_A _IOW(DMA_BUF_BASE, 1, __u32)
96+
#define DMA_BUF_SET_NAME_B _IOW(DMA_BUF_BASE, 1, __u64)
9797

9898
#endif

0 commit comments

Comments
 (0)