diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-08-08 00:09:33 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-08-08 00:20:52 +0300 |
| commit | 8fe8ac24adcd76b12edbfdefa078567bfff117d4 (patch) | |
| tree | feac8553180f619ef6b7318725e5e777ca5b2702 /io_uring | |
| parent | 70ed519ed59da3a92c3acedeb84a30e5a66051ce (diff) | |
| download | linux-8fe8ac24adcd76b12edbfdefa078567bfff117d4.tar.xz | |
io_uring/net: don't pick multiple buffers for non-bundle send
If a send is issued marked with IOSQE_BUFFER_SELECT for selecting a
buffer, unless it's a bundle, it should not select multiple buffers.
Cc: stable@vger.kernel.org
Fixes: a05d1f625c7a ("io_uring/net: support bundles for send")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/net.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 050bea5e7256..d08abcca89cc 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -601,17 +601,18 @@ retry_bundle: .iovs = &kmsg->fast_iov, .max_len = INT_MAX, .nr_iovs = 1, - .mode = KBUF_MODE_EXPAND, }; if (kmsg->free_iov) { arg.nr_iovs = kmsg->free_iov_nr; arg.iovs = kmsg->free_iov; - arg.mode |= KBUF_MODE_FREE; + arg.mode = KBUF_MODE_FREE; } if (!(sr->flags & IORING_RECVSEND_BUNDLE)) arg.nr_iovs = 1; + else + arg.mode |= KBUF_MODE_EXPAND; ret = io_buffers_select(req, &arg, issue_flags); if (unlikely(ret < 0)) |