Skip to content

Commit 661efa2

Browse files
bijudasgeertu
authored andcommitted
pinctrl: renesas: rzg2l: Fix NULL pointer dereference in rzg2l_dt_subnode_to_map()
Fix the below random NULL pointer crash during boot by serializing pinctrl group and function creation/remove calls in rzg2l_dt_subnode_to_map() with mutex lock. Crash log: pc : __pi_strcmp+0x20/0x140 lr : pinmux_func_name_to_selector+0x68/0xa4 Call trace: __pi_strcmp+0x20/0x140 pinmux_generic_add_function+0x34/0xcc rzg2l_dt_subnode_to_map+0x314/0x44c rzg2l_dt_node_to_map+0x164/0x194 pinctrl_dt_to_map+0x218/0x37c create_pinctrl+0x70/0x3d8 While at it, add comments for bitmap_lock and lock. Fixes: c4c4637 ("pinctrl: renesas: Add RZ/G2L pin and gpio controller driver") Tested-by: Chris Paterson <Chris.Paterson2@renesas.com> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/20230815131558.33787-2-biju.das.jz@bp.renesas.com Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
1 parent bfc374a commit 661efa2

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

drivers/pinctrl/renesas/pinctrl-rzg2l.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/interrupt.h>
1212
#include <linux/io.h>
1313
#include <linux/module.h>
14+
#include <linux/mutex.h>
1415
#include <linux/of_device.h>
1516
#include <linux/of_irq.h>
1617
#include <linux/seq_file.h>
@@ -149,10 +150,11 @@ struct rzg2l_pinctrl {
149150
struct gpio_chip gpio_chip;
150151
struct pinctrl_gpio_range gpio_range;
151152
DECLARE_BITMAP(tint_slot, RZG2L_TINT_MAX_INTERRUPT);
152-
spinlock_t bitmap_lock;
153+
spinlock_t bitmap_lock; /* protect tint_slot bitmap */
153154
unsigned int hwirq[RZG2L_TINT_MAX_INTERRUPT];
154155

155-
spinlock_t lock;
156+
spinlock_t lock; /* lock read/write registers */
157+
struct mutex mutex; /* serialize adding groups and functions */
156158
};
157159

158160
static const unsigned int iolh_groupa_mA[] = { 2, 4, 8, 12 };
@@ -362,11 +364,13 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev,
362364
name = np->name;
363365
}
364366

367+
mutex_lock(&pctrl->mutex);
368+
365369
/* Register a single pin group listing all the pins we read from DT */
366370
gsel = pinctrl_generic_add_group(pctldev, name, pins, num_pinmux, NULL);
367371
if (gsel < 0) {
368372
ret = gsel;
369-
goto done;
373+
goto unlock;
370374
}
371375

372376
/*
@@ -380,6 +384,8 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev,
380384
goto remove_group;
381385
}
382386

387+
mutex_unlock(&pctrl->mutex);
388+
383389
maps[idx].type = PIN_MAP_TYPE_MUX_GROUP;
384390
maps[idx].data.mux.group = name;
385391
maps[idx].data.mux.function = name;
@@ -391,6 +397,8 @@ static int rzg2l_dt_subnode_to_map(struct pinctrl_dev *pctldev,
391397

392398
remove_group:
393399
pinctrl_generic_remove_group(pctldev, gsel);
400+
unlock:
401+
mutex_unlock(&pctrl->mutex);
394402
done:
395403
*index = idx;
396404
kfree(configs);
@@ -1509,6 +1517,7 @@ static int rzg2l_pinctrl_probe(struct platform_device *pdev)
15091517

15101518
spin_lock_init(&pctrl->lock);
15111519
spin_lock_init(&pctrl->bitmap_lock);
1520+
mutex_init(&pctrl->mutex);
15121521

15131522
platform_set_drvdata(pdev, pctrl);
15141523

0 commit comments

Comments
 (0)