userfaultfd: fix UFFDIO_CONTINUE ioctl request definition
PATCH v2 1/1 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.
--- include/uapi/linux/userfaultfd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
v2 fix commit message
include/uapi/linux/userfaultfd.h +2 -2
@@ -80,8 +80,8 @@ struct uffdio_zeropage)#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, \ struct uffdio_writeprotect) -#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 {
Signature · 1 line
glebfm
Thanks for catching this!
Quoted 32 lines · Gleb Fotengauer-Malinovskiy
This ioctl request reads from
uffdio_continuestructure which justifies_IOC_READflag.
See NOTEs ininclude/uapi/asm-generic/ioctl.hfor more information.Fixes f619147104c8 ("userfaultfd: add UFFDIO_CONTINUE ioctl")Signed-off-by Gleb Fotengauer-Malinovskiy <[email protected]>Acked-by Peter Xu <[email protected]>--- include/uapi/linux/userfaultfd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)v2 fix commit message
include/uapi/linux/userfaultfd.h +2
-3@@ -80,8 +80,8 @@ struct uffdio_zeropage)#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, \ struct uffdio_writeprotect) -#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 { --glebfm
Hi,
Quoted 3 lines · Gleb Fotengauer-Malinovskiy
This ioctl request reads from
uffdio_continuestructure which justifies_IOC_READflag.
See NOTEs ininclude/uapi/asm-generic/ioctl.hfor more information.
These ioctl flag usage rules seem to be a perpetual source of mistakes. I suggest a slightly different wording of the commit message which is hopefully a bit easier to follow:
"This ioctl request reads from uffdio_continue structure written by userspace which justifies _IOC_WRITE flag. It also writes back to that structure which justifies _IOC_READ flag.
See NOTEs in include/uapi/asm-generic/ioctl.h for more information."
Please make sure this patch is merged before v5.13 is released, otherwise the UAPI bug would have to stay for backwards ABI compatibility.
Quoted 14 lines
Fixes f619147104c8 ("userfaultfd: add UFFDIO_CONTINUE ioctl")Signed-off-by Gleb Fotengauer-Malinovskiy <[email protected]>Acked-by Peter Xu <[email protected]>--- include/uapi/linux/userfaultfd.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)v2 fix commit message
include/uapi/linux/userfaultfd.h +0
-0
include/uapi/linux/userfaultfd.h line 87
Quoted 10 lines
include/uapi/linux/userfaultfd.h +2
-2@@ -80,8 +80,8 @@ struct uffdio_zeropage)#define UFFDIO_WRITEPROTECT _IOWR(UFFDIO, _UFFDIO_WRITEPROTECT, \ struct uffdio_writeprotect) -#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 {
Signature · 1 line
ldv