diff options
| author |   Tiwei Bie <tiwei.btw@antgroup.com> | 2025-06-06 20:44:25 +0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2025-06-25 09:25:49 +0200 |
| commit | c55c7a85e02a7bfee20a3ffebdff7cbeb41613ef (patch) | |
| tree | 30255cc113c4cd86abce5ac45b81dd472d765835 /arch/um/drivers/ubd_user.c | |
| parent | Linux 6.16-rc3 (diff) | |
| download | wireguard-linux-c55c7a85e02a7bfee20a3ffebdff7cbeb41613ef.tar.xz wireguard-linux-c55c7a85e02a7bfee20a3ffebdff7cbeb41613ef.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | arch/um/drivers/ubd_user.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c index c5e6545f6fcf..8e8a8bf518b6 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; |