Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-04 04:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring-6.8-2024-01-26

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAmWz+DIQHGF4Ym9lQGtl
 cm5lbC5kawAKCRD301j7KXHgpqDyD/0TEDXGFeSLs67a+4ytCy2ZDPpEmMLkLue0
 MGutB5hWGWa/1Ll6Icjo2UImkj89kTGLdtPGYTXHQGuTaj2TvOryCm0FhCSJMPOA
 Ak+uIQ9b+5UEULUC0O/L+Fpju8OizV4rrwmSnIXlZQmI0xNCgKK42mUSVen/Vnnw
 7408F90xm9MHXsK/HKEmHIFgwC+KDY3C3PcpeZNpzNe0UcQkcR8hvwsD0EzxBeeL
 K9huD95UuCAI6G6ohRVGUWXCxZ3w340T0z3lAKVKg34CfZ1Qup2MjPQ0BK63Gbfi
 k/CSqAhY5GbxhtgssSslqr2TUBLQDK2SqKlzYQG2r0u/aYnQXQYs81mgbXBlxCQu
 d2c2pIyyXYq8TNtd11R+ig83hplLCc2KhJhVt+t7ZF91ACq/pweA/xNfBiR7FhFV
 FHbTpopa5oEJUtrDA+ebnyX8sUKInls3eJCe6JRP/h1NoOcVElwMKlxLYGT5IoFd
 ABVMCY0lqT760aEHeAlLIR6/RcK07Q2QIBlzAPQyife89ZbwZlaB4E1mUfFcnxmH
 jNJRa3QBR+9gv5VE5JUYnzuUxgGrThRC5Z8OWZ/NdPjeF2NjBy7PESGf1tECE+Yb
 JMaPTiliC7i28sZhEbXpEEF4jko90kt5IGnkOH4tvMa7VAtsudguoHl1WbvbDl19
 Cv+YAtTZhg==
 =xTSJ
 -----END PGP SIGNATURE-----

Merge tag 'io_uring-6.8-2024-01-26' of git://git.kernel.dk/linux

Pull io_uring fix from Jens Axboe:
 "Just a single tweak to the newly added IORING_OP_FIXED_FD_INSTALL from
  Paul, ensuring it goes via the audit path and playing it safe by
  excluding it from using registered creds"

* tag 'io_uring-6.8-2024-01-26' of git://git.kernel.dk/linux:
  io_uring: enable audit and restrict cred override for IORING_OP_FIXED_FD_INSTALL
This commit is contained in:
Linus Torvalds 2024-01-26 15:17:42 -08:00
commit cced1c5e72
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
io_uring/opdef.c
View File

@ -471,7 +471,6 @@ const struct io_issue_def io_issue_defs[] = {
},
[IORING_OP_FIXED_FD_INSTALL] = {
.needs_file = 1,
.audit_skip = 1,
.prep = io_install_fixed_fd_prep,
.issue = io_install_fixed_fd,
},

4
io_uring/openclose.c
View File

@ -277,6 +277,10 @@ int io_install_fixed_fd_prep(struct io_kiocb *req, const struct io_uring_sqe *sq
if (flags & ~IORING_FIXED_FD_NO_CLOEXEC)
return -EINVAL;
/* ensure the task's creds are used when installing/receiving fds */
if (req->flags & REQ_F_CREDS)
return -EPERM;
/* default to O_CLOEXEC, disable if IORING_FIXED_FD_NO_CLOEXEC is set */
ifi = io_kiocb_to_cmd(req, struct io_fixed_install);
ifi->o_flags = O_CLOEXEC;