From 825bacd07b32decf998dd174691a07730f82de76 Mon Sep 17 00:00:00 2001 From: Gleb Fotengauer-Malinovskiy Date: Wed, 2 Jun 2021 13:52:52 +1000 Subject: [PATCH] BACKPORT: FROMGIT: userfaultfd: fix UFFDIO_CONTINUE ioctl request definition This ioctl request reads from uffdio_continue structure which justifies _IOC_READ flag. See NOTEs in include/uapi/asm-generic/ioctl.h for more information. Link: https://lkml.kernel.org/r/20210601143432.1002481-1-glebfm@altlinux.org Link: https://lkml.kernel.org/r/20210531140146.481553-1-glebfm@altlinux.org Fixes: f619147104c8 ("userfaultfd: add UFFDIO_CONTINUE ioctl") Signed-off-by: Gleb Fotengauer-Malinovskiy Acked-by: Peter Xu Reviewed-by: Axel Rasmussen Cc: Daniel Colascione Cc: Lokesh Gidra Signed-off-by: Andrew Morton Signed-off-by: Stephen Rothwell (cherry picked from commit 3fe04bff515162ae8192d7eae77b9a92ed1aa945 https: //git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git akpm) Link: https://lore.kernel.org/patchwork/patch/1439728/ Conflicts: include/uapi/linux/userfaultfd.h (Manual rebase: removed definition of UFFDIO_WRITEPROTECT as it's not implementation on this kernel) Signed-off-by: Lokesh Gidra Bug: 187930641 Change-Id: I85d83958a99e5c68e1118b6c189c78108e47be6c --- include/uapi/linux/userfaultfd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index 0191d247894c..39d11475d6c9 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -76,8 +76,8 @@ struct uffdio_copy) #define UFFDIO_ZEROPAGE _IOWR(UFFDIO, _UFFDIO_ZEROPAGE, \ struct uffdio_zeropage) -#define UFFDIO_CONTINUE _IOR(UFFDIO, _UFFDIO_CONTINUE, \ - struct uffdio_continue) +#define UFFDIO_CONTINUE _IOWR(UFFDIO, _UFFDIO_CONTINUE, \ + struct uffdio_continue) /* read() structure */ struct uffd_msg {