| Message ID | 20211025050055.1129845-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] irqchip/mchp-eic: Fix return value check in mchp_eic_init() | expand |
On 25.10.2021 08:00, Yang Yingliang wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > In case of error, the function of_iomap() returns NULL pointer > not ERR_PTR(). The IS_ERR() test in the return value check > should be replaced with NULL test. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Yang Yingliang <yangyingliang@huawei. Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> Thank you! > --- > drivers/irqchip/irq-mchp-eic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/irqchip/irq-mchp-eic.c b/drivers/irqchip/irq-mchp-eic.c > index 09b7a8cdb611..c726a19837d2 100644 > --- a/drivers/irqchip/irq-mchp-eic.c > +++ b/drivers/irqchip/irq-mchp-eic.c > @@ -209,7 +209,7 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) > return -ENOMEM; > > eic->base = of_iomap(node, 0); > - if (IS_ERR(eic->base)) { > + if (!eic->base) { > ret = -ENOMEM; > goto free; > } > -- > 2.25.1 >
On 25.10.2021 10:44, Claudiu Beznea - M18063 wrote: > On 25.10.2021 08:00, Yang Yingliang wrote: >> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe >> >> In case of error, the function of_iomap() returns NULL pointer >> not ERR_PTR(). The IS_ERR() test in the return value check >> should be replaced with NULL test. >> >> Reported-by: Hulk Robot <hulkci@huawei.com> >> Signed-off-by: Yang Yingliang <yangyingliang@huawei. > Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> Forgot to mention, can you add the Fixes tag? > > Thank you! > >> --- >> drivers/irqchip/irq-mchp-eic.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/irqchip/irq-mchp-eic.c b/drivers/irqchip/irq-mchp-eic.c >> index 09b7a8cdb611..c726a19837d2 100644 >> --- a/drivers/irqchip/irq-mchp-eic.c >> +++ b/drivers/irqchip/irq-mchp-eic.c >> @@ -209,7 +209,7 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) >> return -ENOMEM; >> >> eic->base = of_iomap(node, 0); >> - if (IS_ERR(eic->base)) { >> + if (!eic->base) { >> ret = -ENOMEM; >> goto free; >> } >> -- >> 2.25.1 >> >
On Mon, 25 Oct 2021 10:40:15 +0100, <Claudiu.Beznea@microchip.com> wrote: > > On 25.10.2021 10:44, Claudiu Beznea - M18063 wrote: > > On 25.10.2021 08:00, Yang Yingliang wrote: > >> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > >> > >> In case of error, the function of_iomap() returns NULL pointer > >> not ERR_PTR(). The IS_ERR() test in the return value check > >> should be replaced with NULL test. > >> > >> Reported-by: Hulk Robot <hulkci@huawei.com> > >> Signed-off-by: Yang Yingliang <yangyingliang@huawei. > > Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> > > Forgot to mention, can you add the Fixes tag? There is no real need for one when the offending patch is in the same merge window, and will be in the same pull request. M.
diff --git a/drivers/irqchip/irq-mchp-eic.c b/drivers/irqchip/irq-mchp-eic.c index 09b7a8cdb611..c726a19837d2 100644 --- a/drivers/irqchip/irq-mchp-eic.c +++ b/drivers/irqchip/irq-mchp-eic.c @@ -209,7 +209,7 @@ static int mchp_eic_init(struct device_node *node, struct device_node *parent) return -ENOMEM; eic->base = of_iomap(node, 0); - if (IS_ERR(eic->base)) { + if (!eic->base) { ret = -ENOMEM; goto free; }
In case of error, the function of_iomap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/irqchip/irq-mchp-eic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)