github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 02:31:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

io_uring-6.11-20240722

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmaeZUUQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpnVEEACjgSS0efaTUnhAA2DaPcOZLsrFWySgtexN
 iBkv70M5J5jpQc2r/x8f5zij14fDjs555AmqlAFEIRcNugI9YJ4Yfxcb0pDPbJa3
 Q4jE8JSJFyTBYQ4DVTiC7s/ZZrgO3zKBo2PZZBXQa1KQGB2hBlT6Fm0NxdGILE46
 glX/7NuOU9PJoBOHsunuSBKZYnNf4LXvEKXRsuecwCi2KdY5oVxcQPUZjBS9tbuk
 UX1/ODLxWiwcrgnpY+C3RNzKKKvozN2R28X/iGqF+Zp9aAhtXnj/IPzpx8S2UwQm
 IHAorGDlCXnplMZhGNS2TUjioJkt76uLrkgugNgcUjc7wsiUGHaK2Hj1IRA2Bvdb
 XGvr/3l5dsSnvdQgX1qzt+dxYvCyvIKl7Okq87AIS/0CbKb6eSqC6jw4Gj+3KuL9
 w13QAYfJd7Zw4dMeXlG1eR/QwQEbCz5/umNEPX2o/ZjzvxTpDroqaFKXaiIZeg7u
 VVDhUnXg3s10dZrOKC9FK+StpniJNI/y48w7FEk9x9FUN+hplV8qo0YbjQa6Z5OT
 Xopu/OQ6IMNNv8Ea8TmV634TDmlEbSweQowrolBuZy8hbcb55ujXn3OPdfEuDoob
 2TjI8Az8IOmm48/8WESGGpHgUqbcU8pw9wFDvN3P5MDyBAqEz/OTudB3UP2N1DVO
 FfnDMHB2HA==
 =LA0Z
 -----END PGP SIGNATURE-----

Merge tag 'io_uring-6.11-20240722' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
 "Two minor fixes in here, both heading to stable. In detail:

   - Fix error where forced async uring_cmd getsockopt returns the wrong
     value on execution, leading to it never being completed (Pavel)

   - Fix io_alloc_pbuf_ring() using a NULL check rather than IS_ERR
     (Pavel)"

* tag 'io_uring-6.11-20240722' of git://git.kernel.dk/linux:
  io_uring: fix error pbuf checking
  io_uring: fix lost getsockopt completions
This commit is contained in:
Linus Torvalds 2024-07-22 11:45:48 -07:00
commit 9deed1d5f8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io_uring/kbuf.c
View File

@ -657,8 +657,10 @@ static int io_alloc_pbuf_ring(struct io_ring_ctx *ctx,
ring_size = reg->ring_entries * sizeof(struct io_uring_buf_ring);
bl->buf_ring = io_pages_map(&bl->buf_pages, &bl->buf_nr_pages, ring_size);
if (!bl->buf_ring)
if (IS_ERR(bl->buf_ring)) {
bl->buf_ring = NULL;
return -ENOMEM;
}
bl->is_buf_ring = 1;
bl->is_mmap = 1;

2
io_uring/uring_cmd.c
View File

@ -265,7 +265,7 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags)
req_set_fail(req);
io_req_uring_cleanup(req, issue_flags);
io_req_set_res(req, ret, 0);
return ret;
return ret < 0 ? ret : IOU_OK;
}
int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw,