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

torvalds · torvalds · commit 3e5d15dd83e1 · 2025-02-28T09:11:15.000-08:00
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
diff --git a/io_uring/net.c b/io_uring/net.c
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,9 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req,`
`322`	`322`	`if (unlikely(ret))`
`323`	`323`	`return ret;`
`324`	`324`
`325`		`- return __get_compat_msghdr(&iomsg->msg, &cmsg, NULL);`
	`325`	`+ ret = __get_compat_msghdr(&iomsg->msg, &cmsg, NULL);`
	`326`	`+ sr->msg_control = iomsg->msg.msg_control_user;`
	`327`	`+ return ret;`
`326`	`328`	`}`
`327`	`329`	`#endif`
`328`	`330`