diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-02-27 14:20:09 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-02-27 07:53:31 -0700 |
| commit | 4afc332bc86c34b74f1211650f748feb6942a9cc (patch) | |
| tree | ba89b054ee3dc9b956ad2c610d0ea6eae0f8652c | |
| parent | 0fea2c4509a7aacb32445d12516abf01c012c806 (diff) | |
io_uring/net: fix build warning for !CONFIG_COMPAT
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: 51e158d40589 ("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>
| -rw-r--r-- | io_uring/net.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/io_uring/net.c b/io_uring/net.c index 4ef94bf88cb4..6d13d378358b 100644 --- a/io_uring/net.c +++ b/io_uring/net.c @@ -215,7 +215,6 @@ static int io_net_import_vec(struct io_kiocb *req, struct io_async_msghdr *iomsg return 0; } -#ifdef CONFIG_COMPAT static int io_compat_msg_copy_hdr(struct io_kiocb *req, struct io_async_msghdr *iomsg, 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, msg->msg_iovlen, ddir); } -#endif static int io_copy_msghdr_from_user(struct user_msghdr *msg, 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_iter.nr_segs = 0; -#ifdef CONFIG_COMPAT if (io_is_compat(req->ctx)) { 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; return ret; } -#endif ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_SOURCE, NULL); /* 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; if (io_is_compat(req->ctx)) { -#ifdef CONFIG_COMPAT struct compat_msghdr cmsg; 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)); msg.msg_namelen = cmsg.msg_namelen; msg.msg_controllen = cmsg.msg_controllen; -#endif } else { ret = io_msg_copy_hdr(req, iomsg, &msg, ITER_DEST, &iomsg->uaddr); } |