From cc65e74ac9e134dc9900d43ed1e7aa29249c81bf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 May 2024 17:55:36 +0200 Subject: [PATCH] 5.10-stable patches added patches: pinctrl-core-handle-radix_tree_insert-errors-in-pinctrl_register_one_pin.patch series --- ...t-errors-in-pinctrl_register_one_pin.patch | 66 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 67 insertions(+) create mode 100644 queue-5.10/pinctrl-core-handle-radix_tree_insert-errors-in-pinctrl_register_one_pin.patch create mode 100644 queue-5.10/series diff --git a/queue-5.10/pinctrl-core-handle-radix_tree_insert-errors-in-pinctrl_register_one_pin.patch b/queue-5.10/pinctrl-core-handle-radix_tree_insert-errors-in-pinctrl_register_one_pin.patch new file mode 100644 index 00000000000..915f249f5b9 --- /dev/null +++ b/queue-5.10/pinctrl-core-handle-radix_tree_insert-errors-in-pinctrl_register_one_pin.patch @@ -0,0 +1,66 @@ +From ecfe9a015d3e1e46504d5b3de7eef1f2d186194a Mon Sep 17 00:00:00 2001 +From: Sergey Shtylyov +Date: Wed, 19 Jul 2023 23:22:52 +0300 +Subject: pinctrl: core: handle radix_tree_insert() errors in pinctrl_register_one_pin() + +From: Sergey Shtylyov + +commit ecfe9a015d3e1e46504d5b3de7eef1f2d186194a upstream. + +pinctrl_register_one_pin() doesn't check the result of radix_tree_insert() +despite they both may return a negative error code. Linus Walleij said he +has copied the radix tree code from kernel/irq/ where the functions calling +radix_tree_insert() are *void* themselves; I think it makes more sense to +propagate the errors from radix_tree_insert() upstream if we can do that... + +Found by Linux Verification Center (linuxtesting.org) with the Svace static +analysis tool. + +Signed-off-by: Sergey Shtylyov +Link: https://lore.kernel.org/r/20230719202253.13469-3-s.shtylyov@omp.ru +Signed-off-by: Linus Walleij +Cc: "Hemdan, Hagar Gamal Halim" +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/core.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/drivers/pinctrl/core.c ++++ b/drivers/pinctrl/core.c +@@ -205,6 +205,7 @@ static int pinctrl_register_one_pin(stru + const struct pinctrl_pin_desc *pin) + { + struct pin_desc *pindesc; ++ int error; + + pindesc = pin_desc_get(pctldev, pin->number); + if (pindesc) { +@@ -226,18 +227,25 @@ static int pinctrl_register_one_pin(stru + } else { + pindesc->name = kasprintf(GFP_KERNEL, "PIN%u", pin->number); + if (!pindesc->name) { +- kfree(pindesc); +- return -ENOMEM; ++ error = -ENOMEM; ++ goto failed; + } + pindesc->dynamic_name = true; + } + + pindesc->drv_data = pin->drv_data; + +- radix_tree_insert(&pctldev->pin_desc_tree, pin->number, pindesc); ++ error = radix_tree_insert(&pctldev->pin_desc_tree, pin->number, pindesc); ++ if (error) ++ goto failed; ++ + pr_debug("registered pin %d (%s) on %s\n", + pin->number, pindesc->name, pctldev->desc->name); + return 0; ++ ++failed: ++ kfree(pindesc); ++ return error; + } + + static int pinctrl_register_pins(struct pinctrl_dev *pctldev, diff --git a/queue-5.10/series b/queue-5.10/series new file mode 100644 index 00000000000..37e0beb553d --- /dev/null +++ b/queue-5.10/series @@ -0,0 +1 @@ +pinctrl-core-handle-radix_tree_insert-errors-in-pinctrl_register_one_pin.patch -- 2.47.2