Commit 3e5d15dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.14-20250228' of git://git.kernel.dk/linux 

Pull io_uring fix from Jens Axboe:
 "Just a single fix headed for stable, ensuring that msg_control is
  properly saved in compat mode as well"

* tag 'io_uring-6.14-20250228' of git://git.kernel.dk/linux:
  io_uring/net: save msg_control for compat
parents ea185bde 6ebf0518

io_uring/net.c

+3 −1
Original line number Diff line number Diff line
@@ -322,7 +322,9 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req, 
		if (unlikely(ret))

			return ret;



		return __get_compat_msghdr(&iomsg->msg, &cmsg, NULL);

		ret = __get_compat_msghdr(&iomsg->msg, &cmsg, NULL);

		sr->msg_control = iomsg->msg.msg_control_user;

		return ret;

	}

#endif