* [PATCH] soc: fsl: qe: gpio: Fix an error code in qe_pin_request()
@ 2019-05-03 13:15 Dan Carpenter
2019-05-03 18:45 ` Li Yang
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2019-05-03 13:15 UTC (permalink / raw)
To: Qiang Zhao, Grant Likely; +Cc: kernel-janitors, linuxppc-dev, Li Yang
There was a missing error code in this path. It meant that we returned
ERR_PTR(0) which is NULL and would result in a NULL dereference in the
caller.
Fixes: 1a2d397a6eb5 ("gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/soc/fsl/qe/gpio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
index 819bed0f5667..51b3a47b5a55 100644
--- a/drivers/soc/fsl/qe/gpio.c
+++ b/drivers/soc/fsl/qe/gpio.c
@@ -179,8 +179,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)
if (err < 0)
goto err0;
gc = gpio_to_chip(err);
- if (WARN_ON(!gc))
+ if (WARN_ON(!gc)) {
+ err = -ENODEV;
goto err0;
+ }
if (!of_device_is_compatible(gc->of_node, "fsl,mpc8323-qe-pario-bank")) {
pr_debug("%s: tried to get a non-qe pin\n", __func__);
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] soc: fsl: qe: gpio: Fix an error code in qe_pin_request()
2019-05-03 13:15 [PATCH] soc: fsl: qe: gpio: Fix an error code in qe_pin_request() Dan Carpenter
@ 2019-05-03 18:45 ` Li Yang
2019-05-03 19:43 ` Dan Carpenter
0 siblings, 1 reply; 3+ messages in thread
From: Li Yang @ 2019-05-03 18:45 UTC (permalink / raw)
To: Dan Carpenter; +Cc: linuxppc-dev, kernel-janitors, Qiang Zhao
On Fri, May 3, 2019 at 8:19 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> There was a missing error code in this path. It meant that we returned
> ERR_PTR(0) which is NULL and would result in a NULL dereference in the
> caller.
Thanks Dan. An early version of this patch has been included in a
pending pull request to arm-soc.
https://lkml.org/lkml/2019/5/1/506
>
> Fixes: 1a2d397a6eb5 ("gpio/powerpc: Eliminate duplication of of_get_named_gpio_flags()")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> drivers/soc/fsl/qe/gpio.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/fsl/qe/gpio.c b/drivers/soc/fsl/qe/gpio.c
> index 819bed0f5667..51b3a47b5a55 100644
> --- a/drivers/soc/fsl/qe/gpio.c
> +++ b/drivers/soc/fsl/qe/gpio.c
> @@ -179,8 +179,10 @@ struct qe_pin *qe_pin_request(struct device_node *np, int index)
> if (err < 0)
> goto err0;
> gc = gpio_to_chip(err);
> - if (WARN_ON(!gc))
> + if (WARN_ON(!gc)) {
> + err = -ENODEV;
> goto err0;
> + }
>
> if (!of_device_is_compatible(gc->of_node, "fsl,mpc8323-qe-pario-bank")) {
> pr_debug("%s: tried to get a non-qe pin\n", __func__);
> --
> 2.18.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] soc: fsl: qe: gpio: Fix an error code in qe_pin_request()
2019-05-03 18:45 ` Li Yang
@ 2019-05-03 19:43 ` Dan Carpenter
0 siblings, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2019-05-03 19:43 UTC (permalink / raw)
To: Li Yang; +Cc: linuxppc-dev, kernel-janitors, Qiang Zhao
On Fri, May 03, 2019 at 01:45:07PM -0500, Li Yang wrote:
> On Fri, May 3, 2019 at 8:19 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
> >
> > There was a missing error code in this path. It meant that we returned
> > ERR_PTR(0) which is NULL and would result in a NULL dereference in the
> > caller.
>
> Thanks Dan. An early version of this patch has been included in a
> pending pull request to arm-soc.
> https://lkml.org/lkml/2019/5/1/506
Oops. Sorry, I switched computers and forgot to copy my old outbox
over. :(
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-03 19:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-03 13:15 [PATCH] soc: fsl: qe: gpio: Fix an error code in qe_pin_request() Dan Carpenter
2019-05-03 18:45 ` Li Yang
2019-05-03 19:43 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).