This is a note to let you know that I've just added the patch titled

    tty: keyboard.c: Remove locking from vt_get_leds.

to the 3.6-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-keyboard.c-remove-locking-from-vt_get_leds.patch
and it can be found in the queue-3.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From 157a4b311c45c9aba75a990464d9680867dc8805 Mon Sep 17 00:00:00 2001
From: Christopher Brannon <[email protected]>
Date: Fri, 22 Jun 2012 08:16:34 -0500
Subject: tty: keyboard.c: Remove locking from vt_get_leds.

From: Christopher Brannon <[email protected]>

commit 157a4b311c45c9aba75a990464d9680867dc8805 upstream.

There are three call sites for this function, and all three
are called within a keyboard handler.
kbd_event_lock is already held within keyboard handlers,
so attempting to lock it in vt_get_leds causes deadlock.

Signed-off-by: Christopher Brannon <[email protected]>
Acked-by: Alan Cox <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/tty/vt/keyboard.c |    3 ---
 1 file changed, 3 deletions(-)

--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -1049,13 +1049,10 @@ static int kbd_update_leds_helper(struct
  */
 int vt_get_leds(int console, int flag)
 {
-       unsigned long flags;
        struct kbd_struct * kbd = kbd_table + console;
        int ret;
 
-       spin_lock_irqsave(&kbd_event_lock, flags);
        ret = vc_kbd_led(kbd, flag);
-       spin_unlock_irqrestore(&kbd_event_lock, flags);
 
        return ret;
 }


Patches currently in stable-queue which might be from [email protected] are

queue-3.6/tty-keyboard.c-remove-locking-from-vt_get_leds.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to