Skip to contentSkip to conversation

char: fix possible double-unlock in esp.c

PATCH In review Harvey Harrison 2 participants 3 messages Feb 22, 2008 – Feb 23, 2008 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 char: fix possible double-unlock in esp.c

Hitting either of the break statements in the while loop would cause a double-unlock of info->lock. Add an out label and goto instead of break to skip the unlock in those cases.

Noticed by sparse:
drivers/char/esp.c:2042:2: warning: context imbalance in 'rs_wait_until_sent' - unexpected unlock

---
 drivers/char/esp.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/char/esp.c +3 -2
index 01fbddd..2b14814 100644
@@ -2030,16 +2030,17 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 		msleep_interruptible(jiffies_to_msecs(char_time));
 
 		if (signal_pending(current))
-			break;
+			goto out;
 
 		if (timeout && time_after(jiffies, orig_jiffies + timeout))
-			break;
+			goto out;
 
 		spin_lock_irqsave(&info->lock, flags);
 		serial_out(info, UART_ESI_CMD1, ESI_NO_COMMAND);
 		serial_out(info, UART_ESI_CMD1, ESI_GET_TX_AVAIL);
 	}
 	spin_unlock_irqrestore(&info->lock, flags);
+out:
 	set_current_state(TASK_RUNNING);
 }
 
Signature · 1 line
1.5.4.2.200.g99e75
#1 lore raw
Quoted 17 lines · Harvey Harrison

Hitting either of the break statements in the while loop would cause a double-unlock of info->lock. Add an out label and goto instead of break to skip the unlock in those cases.

Noticed by sparse:
drivers/char/esp.c:2042:2: warning: context imbalance in 'rs_wait_until_sent' - unexpected unlock

---
 drivers/char/esp.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/char/esp.c +0 -0
index 01fbddd..2b14814 100644

drivers/char/esp.c static void rs_wait_until_sent(struct tty_struct *tty, int timeout) · line 2030

Quoted 1 line
drivers/char/esp.c +0 -0
@@ -2030,16 +2030,17 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 		msleep_interruptible(jiffies_to_msecs(char_time));

guarantees current state be running after it returns either interrupted or not.

drivers/char/esp.c static void rs_wait_until_sent(struct tty_struct *tty, int timeout) · line 2033

Quoted 4 lines
drivers/char/esp.c +1 -1
 		if (signal_pending(current))
-			break;
+			goto out;

just return;

drivers/char/esp.c static void rs_wait_until_sent(struct tty_struct *tty, int timeout) · line 2036

Quoted 3 lines
drivers/char/esp.c +1 -1
 		if (timeout && time_after(jiffies, orig_jiffies + timeout))
-			break;
+			goto out;

detto

drivers/char/esp.c static void rs_wait_until_sent(struct tty_struct *tty, int timeout) · line 2044

Quoted 7 lines
drivers/char/esp.c +1 -0
 		spin_lock_irqsave(&info->lock, flags);
 		serial_out(info, UART_ESI_CMD1, ESI_NO_COMMAND);
 		serial_out(info, UART_ESI_CMD1, ESI_GET_TX_AVAIL);
 	}
 	spin_unlock_irqrestore(&info->lock, flags);
+out:
 	set_current_state(TASK_RUNNING);

no need for this.

Quoted 2 lines
drivers/char/esp.c +0 -0
 }
 
#2 lore raw

PATCH v2 2/2 char: fix possible double-unlock in esp.c

Hitting either of the break statements in the while loop would cause a double-unlock of info->lock.

[Jiri Slaby suggested simply returning is safe here, rather than a goto]

Noticed by sparse:
drivers/char/esp.c:2042:2: warning: context imbalance in 'rs_wait_until_sent' - unexpected unlock

---
 drivers/char/esp.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/char/esp.c +2 -2
index 01fbddd..0a33d09 100644
@@ -2030,10 +2030,10 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)
 		msleep_interruptible(jiffies_to_msecs(char_time));
 
 		if (signal_pending(current))
-			break;
+			return;
 
 		if (timeout && time_after(jiffies, orig_jiffies + timeout))
-			break;
+			return;
 
 		spin_lock_irqsave(&info->lock, flags);
 		serial_out(info, UART_ESI_CMD1, ESI_NO_COMMAND);
Signature · 1 line
1.5.4.2.200.g99e75