projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86731a2
)
um: ubd: Add missing error check in start_io_thread()
author
Tiwei Bie
<tiwei.btw@antgroup.com>
Fri, 6 Jun 2025 12:44:25 +0000
(20:44 +0800)
committer
Johannes 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
patch
|
blob
|
history
diff --git
a/arch/um/drivers/ubd_user.c
b/arch/um/drivers/ubd_user.c
index
c5e6545
..
8e8a8bf
100644
(file)
--- 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;