From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>, Sasha Levin <sashal@kernel.org>,
io-uring@vger.kernel.org
Subject: [PATCH AUTOSEL 5.15 26/41] io_uring: fix merge error in checking send/recv addr2 flags
Date: Mon, 27 Jun 2022 22:20:45 -0400 [thread overview]
Message-ID: <20220628022100.595243-26-sashal@kernel.org> (raw)
In-Reply-To: <20220628022100.595243-1-sashal@kernel.org>
From: Jens Axboe <axboe@kernel.dk>
[ Upstream commit b60cac14bb3c88cff2a7088d9095b01a80938c41 ]
With the dropping of the IOPOLL checking in the per-opcode handlers,
we inadvertently left two checks in the recv/recvmsg and send/sendmsg
prep handlers for the same thing, and one of them includes addr2 which
holds the flags for these opcodes.
Fix it up and kill the redundant checks.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/io_uring.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index be2176575353..263d79cb7b31 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -4786,8 +4786,6 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL;
- if (unlikely(sqe->addr2 || sqe->file_index))
- return -EINVAL;
sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));
sr->len = READ_ONCE(sqe->len);
@@ -5009,8 +5007,6 @@ static int io_recvmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
return -EINVAL;
- if (unlikely(sqe->addr2 || sqe->file_index))
- return -EINVAL;
sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));
sr->len = READ_ONCE(sqe->len);
--
2.35.1
next prev parent reply other threads:[~2022-06-28 2:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-28 2:20 [PATCH AUTOSEL 5.15 01/41] spi: spi-cadence: Fix SPI CS gets toggling sporadically Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 02/41] spi: cadence: Detect transmit FIFO depth Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 03/41] spi: spi-mem: Fix spi_mem_poll_status() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 04/41] regulator: qcom_smd: correct MP5496 ranges Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 05/41] ALSA: usb-audio: US16x08: Move overflow check before array access Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 06/41] bus: bt1-apb: Don't print error on -EPROBE_DEFER Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 07/41] bus: bt1-axi: " Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 08/41] drm/vc4: plane: Prevent async update if we don't have a dlist Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 09/41] drm/vc4: crtc: Use an union to store the page flip callback Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 10/41] drm/vc4: crtc: Move the BO handling out of common page-flip callback Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 11/41] selftests: vm: Fix resource leak when return error Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 12/41] scsi: ufs: Simplify ufshcd_clear_cmd() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 13/41] scsi: ufs: Support clearing multiple commands at once Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 14/41] ALSA: x86: intel_hdmi_audio: enable pm_runtime and set autosuspend delay Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 15/41] ALSA: x86: intel_hdmi_audio: use pm_runtime_resume_and_get() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 16/41] hamradio: 6pack: fix array-index-out-of-bounds in decode_std_command() Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 17/41] drivers/net/ethernet/neterion/vxge: Fix a use-after-free bug in vxge-main.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 18/41] powerpc/prom_init: Fix build failure with GCC_PLUGIN_STRUCTLEAK_BYREF_ALL and KASAN Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 19/41] spi: rockchip: Unmask IRQ at the final to avoid preemption Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 20/41] video: fbdev: skeletonfb: Fix syntax errors in comments Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 21/41] video: fbdev: intelfb: Use aperture size from pci_resource_len Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 22/41] video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write Sasha Levin
2022-09-19 8:21 ` Vitaly Chikunov
2022-09-19 22:24 ` Sasha Levin
2022-09-21 5:10 ` Vitaly Chikunov
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 23/41] video: fbdev: simplefb: Check before clk_put() not needed Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 24/41] btrfs: add missing inode updates on each iteration when replacing extents Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 25/41] btrfs: do not BUG_ON() on failure to migrate space " Sasha Levin
2022-06-28 2:20 ` Sasha Levin [this message]
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 27/41] arch: mips: generic: Add missing of_node_put() in board-ranchu.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 28/41] mips: mti-malta: Fix refcount leak in malta-time.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 29/41] mips: ralink: Fix refcount leak in of.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 30/41] mips: lantiq: falcon: Fix refcount leak bug in sysctrl Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 31/41] mips: lantiq: xway: " Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 32/41] mips/pic32/pic32mzda: Fix refcount leak bugs Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 33/41] mips: dts: ingenic: Add TCU clock to x1000/x1830 tcu device node Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 34/41] mips: lantiq: Add missing of_node_put() in irq.c Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 35/41] drm/sun4i: Add DMA mask and segment size Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 36/41] drm/sun4i: Return if frontend is not present Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 37/41] hinic: Replace memcpy() with direct assignment Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 38/41] drm/amdgpu: Adjust logic around GTT size (v3) Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 39/41] nvme: add a bogus subsystem NQN quirk for Micron MTFDKBA2T0TFH Sasha Levin
2022-06-28 2:20 ` [PATCH AUTOSEL 5.15 40/41] gpio: grgpio: Fix device removing Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220628022100.595243-26-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).