torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

io_uring/net: fix build warning for !CONFIG_COMPAT

Browse Source 
A code rework resulted in an uninitialized return code when COMPAT
mode is disabled:

io_uring/net.c:722:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]
  722 |         if (io_is_compat(req->ctx)) {
      |             ^~~~~~~~~~~~~~~~~~~~~~
io_uring/net.c:736:15: note: uninitialized use occurs here
  736 |         if (unlikely(ret))
      |                      ^~~

Since io_is_compat() turns into a compile-time 'false', the #ifdef
here is completely unnecessary, and removing it avoids the warning.

Fixes: 51e158d405 ("io_uring/net: unify *mshot_prep calls with compat")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250227132018.1111094-1-arnd@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Arnd Bergmann 2025-02-27 14:20:09 +01:00 committed by Jens Axboe
parent 0fea2c4509
commit 4afc332bc8
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
io_uring/net.c
View File

@ -215,7 +215,6 @@ static int io_net_import_vec(struct io_kiocb *req, struct io_async_msghdr *iomsg
return 0; return 0;
} }
#ifdef CONFIG_COMPAT
static int io_compat_msg_copy_hdr(struct io_kiocb *req, static int io_compat_msg_copy_hdr(struct io_kiocb *req,
struct io_async_msghdr *iomsg, struct io_async_msghdr *iomsg,
struct compat_msghdr *msg, int ddir, struct compat_msghdr *msg, int ddir,
@ -252,7 +251,6 @@ static int io_compat_msg_copy_hdr(struct io_kiocb *req,
return io_net_import_vec(req, iomsg, (struct iovec __user *)uiov, return io_net_import_vec(req, iomsg, (struct iovec __user *)uiov,
msg->msg_iovlen, ddir); msg->msg_iovlen, ddir);
} }
#endif
static int io_copy_msghdr_from_user(struct user_msghdr *msg, static int io_copy_msghdr_from_user(struct user_msghdr *msg,
struct user_msghdr __user *umsg) struct user_msghdr __user *umsg)
@ -319,7 +317,6 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req,
iomsg->msg.msg_name = &iomsg->addr; iomsg->msg.msg_name = &iomsg->addr;
iomsg->msg.msg_iter.nr_segs = 0; iomsg->msg.msg_iter.nr_segs = 0;
#ifdef CONFIG_COMPAT
if (io_is_compat(req->ctx)) { if (io_is_compat(req->ctx)) {
struct compat_msghdr cmsg; struct compat_msghdr cmsg;
@ -328,7 +325,6 @@ static int io_sendmsg_copy_hdr(struct io_kiocb *req,
sr->msg_control = iomsg->msg.msg_control_user; sr->msg_control = iomsg->msg.msg_control_user;
return ret; return ret;
} }
#endif
ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_SOURCE, NULL); ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_SOURCE, NULL);
/* save msg_control as sys_sendmsg() overwrites it */ /* save msg_control as sys_sendmsg() overwrites it */
@ -709,7 +705,6 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
iomsg->msg.msg_iter.nr_segs = 0; iomsg->msg.msg_iter.nr_segs = 0;
if (io_is_compat(req->ctx)) { if (io_is_compat(req->ctx)) {
#ifdef CONFIG_COMPAT
struct compat_msghdr cmsg; struct compat_msghdr cmsg;
ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_DEST, ret = io_compat_msg_copy_hdr(req, iomsg, &cmsg, ITER_DEST,
@ -717,7 +712,6 @@ static int io_recvmsg_copy_hdr(struct io_kiocb *req,
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
msg.msg_namelen = cmsg.msg_namelen; msg.msg_namelen = cmsg.msg_namelen;
msg.msg_controllen = cmsg.msg_controllen; msg.msg_controllen = cmsg.msg_controllen;
#endif
} else { } else {
ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_DEST, &iomsg->uaddr); ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_DEST, &iomsg->uaddr);
} }