diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2013-03-05 07:09:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-06 08:47:04 +0100 |
| commit | 2f7c069b96ed7b1f6236f2fa7b0bc06f4f54f2d9 (patch) | |
| tree | 51aef4f367dfd5676e1eefaaf3f0ba6b8425e5d7 /net | |
| parent | net/irda: Fix port open counts (diff) | |
| download | linux-2f7c069b96ed7b1f6236f2fa7b0bc06f4f54f2d9.tar.xz linux-2f7c069b96ed7b1f6236f2fa7b0bc06f4f54f2d9.zip | |
net/irda: Hold port lock while bumping blocked_open
Although tty_lock() already protects concurrent update to
blocked_open, that fails to meet the separation-of-concerns between
tty_port and tty.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/irda/ircomm/ircomm_tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c index 1721dc7e4315..d282bbea710e 100644 --- a/net/irda/ircomm/ircomm_tty.c +++ b/net/irda/ircomm/ircomm_tty.c @@ -317,8 +317,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, spin_lock_irqsave(&port->lock, flags); if (!tty_hung_up_p(filp)) port->count--; - spin_unlock_irqrestore(&port->lock, flags); port->blocked_open++; + spin_unlock_irqrestore(&port->lock, flags); while (1) { if (tty->termios.c_cflag & CBAUD) @@ -362,8 +362,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self, spin_lock_irqsave(&port->lock, flags); if (!tty_hung_up_p(filp)) port->count++; - spin_unlock_irqrestore(&port->lock, flags); port->blocked_open--; + spin_unlock_irqrestore(&port->lock, flags); IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n", __FILE__, __LINE__, tty->driver->name, port->count); |