This is a note to let you know that I've just added the patch titled
tty: use 'if' in send_break() instead of 'goto'
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tty-use-if-in-send_break-instead-of-goto.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 8af6f242e3bcfa8e07e29646e5b7cbd4e93b4324
Author: Jiri Slaby (SUSE) <jirislaby@xxxxxxxxxx>
Date: Tue Sep 19 10:51:56 2023 +0200
tty: use 'if' in send_break() instead of 'goto'
[ Upstream commit 24f2cd019946fc2e88e632d2e24a34c2cc3f2be4 ]
Now, the "jumped-over" code is simple enough to be put inside an 'if'.
Do so to make it 'goto'-less.
Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230919085156.1578-16-jirislaby@xxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Stable-dep-of: 66aad7d8d3ec ("usb: cdc-acm: return correct error code on unsupported break")
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index a45e6e1423d8..1c76e77e2d07 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2477,11 +2477,10 @@ static int send_break(struct tty_struct *tty, unsigned int duration)
return -EINTR;
retval = tty->ops->break_ctl(tty, -1);
- if (retval)
- goto out;
- msleep_interruptible(duration);
- retval = tty->ops->break_ctl(tty, 0);
-out:
+ if (!retval) {
+ msleep_interruptible(duration);
+ retval = tty->ops->break_ctl(tty, 0);
+ }
tty_write_unlock(tty);
if (signal_pending(current))
