+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2131,14 +2131,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2169,14 +2166,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR, 0);
-
- percpu_ref_put(&ctx->users);
-
wifi-nl80211-reject-iftype-change-with-mesh-id-change.patch
btrfs-dev-replace-properly-validate-device-names.patch
mmc-core-fix-emmc-initialization-with-1-bit-bus-connection.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
cachefiles-fix-memory-leak-in-cachefiles_add_cache.patch
gpio-74x164-enable-output-pins-after-registers-are-r.patch
+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2121,14 +2121,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2159,14 +2156,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR, 0);
-
- percpu_ref_put(&ctx->users);
-
mmc-sdhci-xenon-fix-phy-init-clock-stability.patch
riscv-add-caller_addrx-support.patch
pmdomain-qcom-rpmhpd-fix-enabled_corner-aggregation.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
x86-cpu-intel-detect-tme-keyid-bits-before-setting-mtrr-mask-registers.patch
mptcp-fix-possible-deadlock-in-subflow-diag.patch
ext4-avoid-bb_free-and-bb_fragments-inconsistency-in-mb_free_blocks.patch
+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2120,14 +2120,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2158,14 +2155,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR, 0);
-
- percpu_ref_put(&ctx->users);
-
mmc-sdhci-xenon-fix-phy-init-clock-stability.patch
riscv-add-caller_addrx-support.patch
pmdomain-qcom-rpmhpd-fix-enabled_corner-aggregation.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
x86-cpu-intel-detect-tme-keyid-bits-before-setting-mtrr-mask-registers.patch
mptcp-move-__mptcp_error_report-in-protocol.c.patch
mptcp-process-pending-subflow-error-on-close.patch
+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2126,14 +2126,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2164,14 +2161,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR, 0);
-
- percpu_ref_put(&ctx->users);
-
dmaengine-fsl-qdma-fix-soc-may-hang-on-16-byte-unaligned-read.patch
dmaengine-fsl-qdma-init-irq-after-reg-initialization.patch
mmc-core-fix-emmc-initialization-with-1-bit-bus-connection.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
x86-cpu-intel-detect-tme-keyid-bits-before-setting-mtrr-mask-registers.patch
cachefiles-fix-memory-leak-in-cachefiles_add_cache.patch
fs-hugetlb-fix-null-pointer-dereference-in-hugetlbs_fill_super.patch
+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2141,14 +2141,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2179,14 +2176,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR);
-
- percpu_ref_put(&ctx->users);
-
riscv-add-caller_addrx-support.patch
efivarfs-request-at-most-512-bytes-for-variable-names.patch
pmdomain-qcom-rpmhpd-fix-enabled_corner-aggregation.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
x86-e820-don-t-reserve-setup_rng_seed-in-e820.patch
x86-cpu-intel-detect-tme-keyid-bits-before-setting-mtrr-mask-registers.patch
mptcp-fix-data-races-on-local_id.patch
+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2119,14 +2119,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2157,14 +2154,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR);
-
- percpu_ref_put(&ctx->users);
-
iommufd-fix-iopt_access_list_id-overwrite-bug.patch
efivarfs-request-at-most-512-bytes-for-variable-names.patch
pmdomain-qcom-rpmhpd-fix-enabled_corner-aggregation.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
mm-debug_vm_pgtable-fix-bug_on-with-pud-advanced-test.patch
x86-e820-don-t-reserve-setup_rng_seed-in-e820.patch
x86-cpu-intel-detect-tme-keyid-bits-before-setting-mtrr-mask-registers.patch
+++ /dev/null
-From 54cbc058d86beca3515c994039b5c0f0a34f53dd Mon Sep 17 00:00:00 2001
-From: Bart Van Assche <bvanassche@acm.org>
-Date: Thu, 15 Feb 2024 12:47:39 -0800
-Subject: fs/aio: Make io_cancel() generate completions again
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-commit 54cbc058d86beca3515c994039b5c0f0a34f53dd upstream.
-
-The following patch accidentally removed the code for delivering
-completions for cancelled reads and writes to user space: "[PATCH 04/33]
-aio: remove retry-based AIO"
-(https://lore.kernel.org/all/1363883754-27966-5-git-send-email-koverstreet@google.com/)
->From that patch:
-
-- if (kiocbIsCancelled(iocb)) {
-- ret = -EINTR;
-- aio_complete(iocb, ret, 0);
-- /* must not access the iocb after this */
-- goto out;
-- }
-
-This leads to a leak in user space of a struct iocb. Hence this patch
-that restores the code that reports to user space that a read or write
-has been cancelled successfully.
-
-Fixes: 41003a7bcfed ("aio: remove retry-based AIO")
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Avi Kivity <avi@scylladb.com>
-Cc: Sandeep Dhavale <dhavale@google.com>
-Cc: Jens Axboe <axboe@kernel.dk>
-Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Cc: Kent Overstreet <kent.overstreet@linux.dev>
-Cc: stable@vger.kernel.org
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://lore.kernel.org/r/20240215204739.2677806-3-bvanassche@acm.org
-Signed-off-by: Christian Brauner <brauner@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/aio.c | 27 +++++++++++----------------
- 1 file changed, 11 insertions(+), 16 deletions(-)
-
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -2119,14 +2119,11 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat
- #endif
-
- /* sys_io_cancel:
-- * Attempts to cancel an iocb previously passed to io_submit. If
-- * the operation is successfully cancelled, the resulting event is
-- * copied into the memory pointed to by result without being placed
-- * into the completion queue and 0 is returned. May fail with
-- * -EFAULT if any of the data structures pointed to are invalid.
-- * May fail with -EINVAL if aio_context specified by ctx_id is
-- * invalid. May fail with -EAGAIN if the iocb specified was not
-- * cancelled. Will fail with -ENOSYS if not implemented.
-+ * Attempts to cancel an iocb previously passed to io_submit(). If the
-+ * operation is successfully cancelled 0 is returned. May fail with
-+ * -EFAULT if any of the data structures pointed to are invalid. May
-+ * fail with -EINVAL if aio_context specified by ctx_id is invalid. Will
-+ * fail with -ENOSYS if not implemented.
- */
- SYSCALL_DEFINE3(io_cancel, aio_context_t, ctx_id, struct iocb __user *, iocb,
- struct io_event __user *, result)
-@@ -2157,14 +2154,12 @@ SYSCALL_DEFINE3(io_cancel, aio_context_t
- }
- spin_unlock_irq(&ctx->ctx_lock);
-
-- if (!ret) {
-- /*
-- * The result argument is no longer used - the io_event is
-- * always delivered via the ring buffer. -EINPROGRESS indicates
-- * cancellation is progress:
-- */
-- ret = -EINPROGRESS;
-- }
-+ /*
-+ * The result argument is no longer used - the io_event is always
-+ * delivered via the ring buffer.
-+ */
-+ if (ret == 0 && kiocb->rw.ki_flags & IOCB_AIO_RW)
-+ aio_complete_rw(&kiocb->rw, -EINTR);
-
- percpu_ref_put(&ctx->users);
-
efivarfs-request-at-most-512-bytes-for-variable-names.patch
pmdomain-arm-fix-null-dereference-on-scmi_perf_domain-removal.patch
pmdomain-qcom-rpmhpd-fix-enabled_corner-aggregation.patch
-fs-aio-make-io_cancel-generate-completions-again.patch
fprobe-fix-to-allocate-entry_data_size-buffer-with-rethook-instances.patch
mm-debug_vm_pgtable-fix-bug_on-with-pud-advanced-test.patch
mm-vmscan-fix-a-bug-calling-wakeup_kswapd-with-a-wrong-zone-index.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
