From: Tiwei Bie <tiwei.btw@antgroup.com>
Date: Fri, 6 Jun 2025 12:44:25 +0000 (+0800)
Subject: um: ubd: Add missing error check in start_io_thread()
X-Git-Tag: v6.16-rc4~32^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c55c7a85e02a7bfee20a3ffebdff7cbeb41613ef;p=thirdparty%2Fkernel%2Fstable.git

um: ubd: Add missing error check in start_io_thread()

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>
---

diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index c5e6545f6fcf6..8e8a8bf518b63 100644
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -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;