From: Liu Yong <pkfxxxing@gmail.com>
Date: Thu, 13 Aug 2020 06:56:44 +0000 (-0700)
Subject: fs/io_uring.c: Fix uninitialized variable is referenced in io_submit_sqe
X-Git-Tag: v5.4.59~266
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a02df82a59c3dbc7bf657efca82e1641ca472eb4;p=users%2Fdwmw2%2Flinux.git

fs/io_uring.c: Fix uninitialized variable is referenced in io_submit_sqe

the commit <a4d61e66ee4a> ("<io_uring: prevent re-read of sqe->opcode>")
caused another vulnerability. After io_get_req(), the sqe_submit struct
in req is not initialized, but the following code defaults that
req->submit.opcode is available.

Signed-off-by: Liu Yong <pkfxxxing@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/io_uring.c b/fs/io_uring.c
index be3d595a607f4..c1aaee061dae5 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2559,6 +2559,7 @@ static void io_submit_sqe(struct io_ring_ctx *ctx, struct sqe_submit *s,
 		goto err;
 	}
 
+	memcpy(&req->submit, s, sizeof(*s));
 	ret = io_req_set_file(ctx, s, state, req);
 	if (unlikely(ret)) {
 err_req: