lkml.org 
[lkml]   [2011]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/4] TTY: serial, fix locking imbalance
    On 08/31/2011 09:24 PM, Jiri Slaby wrote:
    > Commit "TTY: serial, move locking in uart_close" moved the lock, but
    > omitted to update branches which unlock the lock. Now they try to
    > unlock the lock without holding it.
    >
    > Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    > ---
    > If possible, please, merge this into the patch mentioned above (it's
    > not upstream yet).

    Hi Greg, should I resend these?

    > drivers/tty/serial/serial_core.c | 5 ++---
    > 1 files changed, 2 insertions(+), 3 deletions(-)
    >
    > diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
    > index 5c04cb9..c0fdbc5 100644
    > --- a/drivers/tty/serial/serial_core.c
    > +++ b/drivers/tty/serial/serial_core.c
    > @@ -1262,7 +1262,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
    >
    > if (tty_hung_up_p(filp)) {
    > spin_unlock_irqrestore(&port->lock, flags);
    > - goto done;
    > + return;
    > }
    >
    > if ((tty->count == 1) && (port->count != 1)) {
    > @@ -1284,7 +1284,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
    > }
    > if (port->count) {
    > spin_unlock_irqrestore(&port->lock, flags);
    > - goto done;
    > + return;
    > }
    >
    > /*
    > @@ -1347,7 +1347,6 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
    > wake_up_interruptible(&port->open_wait);
    > wake_up_interruptible(&port->close_wait);
    >
    > -done:
    > mutex_unlock(&port->mutex);
    > }
    >


    --
    js


    \
     
     \ /
      Last update: 2011-09-22 20:33    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site