]> git.karo-electronics.de Git - linux-beck.git/commitdiff
gpiolib: Fix locking on gpio debugfs files
authorGrant Likely <grant.likely@secretlab.ca>
Sat, 9 Feb 2013 09:41:49 +0000 (09:41 +0000)
committerGrant Likely <grant.likely@secretlab.ca>
Mon, 11 Feb 2013 22:21:28 +0000 (22:21 +0000)
The debugfs files really need to hold the gpiolib spinlock before
accessing the list. Otherwise chip addition/removal will cause an oops.

Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
drivers/gpio/gpiolib.c

index 5050693dcc350e59feb07102f7c95a2aceb4a552..4b3f388bcc6d8e47ac8ae3ccb311091b5dfde032 100644 (file)
@@ -2053,29 +2053,35 @@ static void gpiolib_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 
 static void *gpiolib_seq_start(struct seq_file *s, loff_t *pos)
 {
+       unsigned long flags;
        struct gpio_chip *chip = NULL;
        loff_t index = *pos;
 
-       /* REVISIT this isn't locked against gpio_chip removal ... */
-
        s->private = "";
 
+       spin_lock_irqsave(&gpio_lock, flags);
        list_for_each_entry(chip, &gpio_chips, list)
-               if (index-- == 0)
+               if (index-- == 0) {
+                       spin_unlock_irqrestore(&gpio_lock, flags);
                        return chip;
+               }
+       spin_unlock_irqrestore(&gpio_lock, flags);
 
        return NULL;
 }
 
 static void *gpiolib_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
+       unsigned long flags;
        struct gpio_chip *chip = v;
        void *ret = NULL;
 
+       spin_lock_irqsave(&gpio_lock, flags);
        if (list_is_last(&chip->list, &gpio_chips))
                ret = NULL;
        else
                ret = list_entry(chip->list.next, struct gpio_chip, list);
+       spin_unlock_irqrestore(&gpio_lock, flags);
 
        s->private = "\n";
        ++*pos;