]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
um: ubd: Add missing error check in start_io_thread()
authorTiwei Bie <tiwei.btw@antgroup.com>
Fri, 6 Jun 2025 12:44:25 +0000 (20:44 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 25 Jun 2025 07:25:49 +0000 (09:25 +0200)
The subsequent call to os_set_fd_block() overwrites the previous
return value. OR the two return values together to fix it.

Fixes: f88f0bdfc32f ("um: UBD Improvements")
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20250606124428.148164-2-tiwei.btw@antgroup.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
arch/um/drivers/ubd_user.c

index c5e6545f6fcf67f0faf029f783a4baca55eb7e70..8e8a8bf518b634378ecdcddd21dcabe01ddcd8c4 100644 (file)
@@ -41,7 +41,7 @@ int start_io_thread(struct os_helper_thread **td_out, int *fd_out)
        *fd_out = fds[1];
 
        err = os_set_fd_block(*fd_out, 0);
-       err = os_set_fd_block(kernel_fd, 0);
+       err |= os_set_fd_block(kernel_fd, 0);
        if (err) {
                printk("start_io_thread - failed to set nonblocking I/O.\n");
                goto out_close;