gpiolib: extend the critical sections of lookup tables

There are two places in the code where we retrieve a lookup table using
gpiod_find_lookup_table() (which protects the table list with the lookup
table lock) and then use it after the lock is released.

We need to keep the lookup table mutex locked the entire time we're using
the tables. Remove the locking from gpiod_find_lookup_table() and use
guards to protect the code actually using the table objects.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index edffa0d2acaa0469fd0497a1e1624b0fe33da8a7..7c27a1efc1b063cd892292f52ad3d58801dd6e6b 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -3822,8 +3822,6 @@ static struct gpiod_lookup_table *gpiod_find_lookup_table(struct device *dev)
        const char *dev_id = dev ? dev_name(dev) : NULL;
        struct gpiod_lookup_table *table;
 
-       mutex_lock(&gpio_lookup_lock);
-
        list_for_each_entry(table, &gpio_lookup_list, list) {
                if (table->dev_id && dev_id) {
                        /*
@@ -3831,21 +3829,18 @@ static struct gpiod_lookup_table *gpiod_find_lookup_table(struct device *dev)
                         * a match
                         */
                        if (!strcmp(table->dev_id, dev_id))
-                               goto found;
+                               return table;
                } else {
                        /*
                         * One of the pointers is NULL, so both must be to have
                         * a match
                         */
                        if (dev_id == table->dev_id)
-                               goto found;
+                               return table;
                }
        }
-       table = NULL;
 
-found:
-       mutex_unlock(&gpio_lookup_lock);
-       return table;
+       return NULL;
 }
 
 static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
@@ -3855,6 +3850,8 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
        struct gpiod_lookup_table *table;
        struct gpiod_lookup *p;
 
+       guard(mutex)(&gpio_lookup_lock);
+
        table = gpiod_find_lookup_table(dev);
        if (!table)
                return desc;
@@ -3920,15 +3917,18 @@ static int platform_gpio_count(struct device *dev, const char *con_id)
        struct gpiod_lookup *p;
        unsigned int count = 0;
 
-       table = gpiod_find_lookup_table(dev);
-       if (!table)
-               return -ENOENT;
+       scoped_guard(mutex, &gpio_lookup_lock) {
+               table = gpiod_find_lookup_table(dev);
+               if (!table)
+                       return -ENOENT;
 
-       for (p = &table->table[0]; p->key; p++) {
-               if ((con_id && p->con_id && !strcmp(con_id, p->con_id)) ||
-                   (!con_id && !p->con_id))
-                       count++;
+               for (p = &table->table[0]; p->key; p++) {
+                       if ((con_id && p->con_id && !strcmp(con_id, p->con_id)) ||
+                           (!con_id && !p->con_id))
+                               count++;
+               }
        }
+
        if (!count)
                return -ENOENT;