userfaultfd: provide properly masked address for huge-pages
Subsystems (3)
PATCH 1/1 userfaultfd: provide properly masked address for huge-pages
From: Nadav Amit <[email protected]>
Commit 824ddc601adc ("userfaultfd: provide unmasked address on page-fault") was introduced to fix an old bug, in which the offset in the address of a page-fault was masked. Concerns were raised - although were never backed by actual code - that some userspace code might break because the bug has been around for quite a while. To address these concerns a new flag was introduced, and only when this flag is set by the user, userfaultfd provides the exact address of the page-fault.
The commit however had a bug, and if the flag is unset, the offset was always masked based on a base-page granularity. Yet, for huge-pages, the behavior prior to the commit was that the address is masked to the huge-page granulrity.
While there are no reports on real breakage, fix this issue. If the flag is unset, use the address with the masking that was done before.
--- fs/userfaultfd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/userfaultfd.c +7 -5
@@ -192,17 +192,19 @@ static inline void msg_init(struct uffd_msg *msg) }static inline struct uffd_msg userfault_msg (unsigned long address, +unsigned long real_address,unsigned int flags,unsigned long reason,unsigned int features) {struct uffd_msg msg; +msg_init (&msg); msg.event =UFFD_EVENT_PAGEFAULT ; -if (!(features &UFFD_FEATURE_EXACT_ADDRESS )) - address &=PAGE_MASK ; - msg.arg.pagefault.address = address; + msg.arg.pagefault.address = (features &UFFD_FEATURE_EXACT_ADDRESS ) ? + real_address : address; +/* * These flags indicate why the userfault occurred: * - UFFD_PAGEFAULT_FLAG_WP indicates a write protect fault.
@@ -488,8 +490,8 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)init_waitqueue_func_entry (&uwq.wq, userfaultfd_wake_function); uwq.wq.private = current; - uwq.msg =userfault_msg (vmf->real_address, vmf->flags, reason, - ctx->features); + uwq.msg =userfault_msg (vmf->address, vmf->real_address, vmf->flags, + reason, ctx->features); uwq.ctx = ctx; uwq.waken = false;
Signature · 1 line
2.25.1
Quoted 18 lines · Nadav Amit
From: Nadav Amit <[email protected]>
Commit
824ddc601adc("userfaultfd: provide unmasked address on page-fault") was introduced to fix an old bug, in which the offset in the address of a page-fault was masked. Concerns were raised - although were never backed by actual code - that some userspace code might break because the bug has been around for quite a while. To address these concerns a new flag was introduced, and only when this flag is set by the user, userfaultfd provides the exact address of the page-fault.The commit however had a bug, and if the flag is unset, the offset was always masked based on a base-page granularity. Yet, for huge-pages, the behavior prior to the commit was that the address is masked to the huge-page granulrity.
While there are no reports on real breakage, fix this issue. If the flag is unset, use the address with the masking that was done before.
Quoted 9 lines
Fixes 824ddc601adc ("userfaultfd: provide unmasked address on page-fault")Reported-by James Houghton <[email protected]>Cc Peter Xu <[email protected]>Cc David Hildenbrand <[email protected]>Cc Mike Rapoport <[email protected]>Cc Jan Kara <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc <[email protected]>Signed-off-by Nadav Amit <[email protected]>
Quoted 45 lines
--- fs/userfaultfd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)fs/userfaultfd.c +7
-5@@ -192,17 +192,19 @@ static inline void msg_init(struct uffd_msg *msg) }static inline struct uffd_msg userfault_msg (unsigned long address, +unsigned long real_address,unsigned int flags,unsigned long reason,unsigned int features) {struct uffd_msg msg; +msg_init (&msg); msg.event =UFFD_EVENT_PAGEFAULT ; -if (!(features &UFFD_FEATURE_EXACT_ADDRESS )) - address &=PAGE_MASK ; - msg.arg.pagefault.address = address; + msg.arg.pagefault.address = (features &UFFD_FEATURE_EXACT_ADDRESS ) ? + real_address : address; +/* * These flags indicate why the userfault occurred: * - UFFD_PAGEFAULT_FLAG_WP indicates a write protect fault. @@ -488,8 +490,8 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)init_waitqueue_func_entry (&uwq.wq, userfaultfd_wake_function); uwq.wq.private = current; - uwq.msg =userfault_msg (vmf->real_address, vmf->flags, reason, - ctx->features); + uwq.msg =userfault_msg (vmf->address, vmf->real_address, vmf->flags, + reason, ctx->features); uwq.ctx = ctx; uwq.waken = false;Signature · 1 line
2.25.1
Signature · 2 lines
Sincerely yours, Mike.
Quoted 18 lines · Nadav Amit
From: Nadav Amit <[email protected]>
Commit
824ddc601adc("userfaultfd: provide unmasked address on page-fault") was introduced to fix an old bug, in which the offset in the address of a page-fault was masked. Concerns were raised - although were never backed by actual code - that some userspace code might break because the bug has been around for quite a while. To address these concerns a new flag was introduced, and only when this flag is set by the user, userfaultfd provides the exact address of the page-fault.The commit however had a bug, and if the flag is unset, the offset was always masked based on a base-page granularity. Yet, for huge-pages, the behavior prior to the commit was that the address is masked to the huge-page granulrity.
While there are no reports on real breakage, fix this issue. If the flag is unset, use the address with the masking that was done before.
Quoted 9 lines
Fixes 824ddc601adc ("userfaultfd: provide unmasked address on page-fault")Reported-by James Houghton <[email protected]>Cc Peter Xu <[email protected]>Cc David Hildenbrand <[email protected]>Cc Mike Rapoport <[email protected]>Cc Jan Kara <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc <[email protected]>Signed-off-by Nadav Amit <[email protected]>
Signature · 1 line
Peter Xu
Quoted 19 lines · Nadav Amit
From: Nadav Amit <[email protected]>
Commit
824ddc601adc("userfaultfd: provide unmasked address on page-fault") was introduced to fix an old bug, in which the offset in the address of a page-fault was masked. Concerns were raised - although were never backed by actual code - that some userspace code might break because the bug has been around for quite a while. To address these concerns a new flag was introduced, and only when this flag is set by the user, userfaultfd provides the exact address of the page-fault.The commit however had a bug, and if the flag is unset, the offset was always masked based on a base-page granularity. Yet, for huge-pages, the behavior prior to the commit was that the address is masked to the huge-page granulrity.
While there are no reports on real breakage, fix this issue. If the flag is unset, use the address with the masking that was done before.
Quoted 9 lines
Fixes 824ddc601adc ("userfaultfd: provide unmasked address on page-fault")Reported-by James Houghton <[email protected]>Cc Peter Xu <[email protected]>Cc David Hildenbrand <[email protected]>Cc Mike Rapoport <[email protected]>Cc Jan Kara <[email protected]>Cc Andrea Arcangeli <[email protected]>Cc <[email protected]>Signed-off-by Nadav Amit <[email protected]>
Thanks!
Quoted 45 lines
--- fs/userfaultfd.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)fs/userfaultfd.c +7
-6@@ -192,17 +192,19 @@ static inline void msg_init(struct uffd_msg *msg) }static inline struct uffd_msg userfault_msg (unsigned long address, +unsigned long real_address,unsigned int flags,unsigned long reason,unsigned int features) {struct uffd_msg msg; +msg_init (&msg); msg.event =UFFD_EVENT_PAGEFAULT ; -if (!(features &UFFD_FEATURE_EXACT_ADDRESS )) - address &=PAGE_MASK ; - msg.arg.pagefault.address = address; + msg.arg.pagefault.address = (features &UFFD_FEATURE_EXACT_ADDRESS ) ? + real_address : address; +/* * These flags indicate why the userfault occurred: * - UFFD_PAGEFAULT_FLAG_WP indicates a write protect fault. @@ -488,8 +490,8 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)init_waitqueue_func_entry (&uwq.wq, userfaultfd_wake_function); uwq.wq.private = current; - uwq.msg =userfault_msg (vmf->real_address, vmf->flags, reason, - ctx->features); + uwq.msg =userfault_msg (vmf->address, vmf->real_address, vmf->flags, + reason, ctx->features); uwq.ctx = ctx; uwq.waken = false; --2.25.1