1 files changed, 7 insertions, 1 deletions

diff --git a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
index 13f0bf852b2a..5d1289d33410 100644
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
@@ -170,7 +170,13 @@ static int winch_tramp(int fd, struct tty_struct *tty, int *fd_out)
                 err = -EINVAL;
                 goto out_close;
         }
-        return err ;
+
+        if (os_set_fd_block(*fd_out, 0)) {
+                printk("winch_tramp: failed to set thread_fd non-blocking.\n");
+                goto out_close;
+        }
+
+        return err;
 
  out_close:
         os_close_file(fds[1]);