| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <41b49828-e0bc-3e7a-32d7-5ee41c778206@omp.ru>
Date: Mon, 14 Feb 2022 13:43:11 +0300
From: Sergey Shtylyov <s.shtylyov@....ru>
To: Geert Uytterhoeven <geert@...ux-m68k.org>
CC: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J. Wysocki" <rafael@...nel.org>,
<linux-kernel@...r.kernel.org>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Corey Minyard <minyard@....org>,
"Oleksij Rempel" <linux@...pel-privat.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
William Breathitt Gray <vilhelm.gray@...il.com>,
"Mun Yew Tham" <mun.yew.tham@...el.com>,
Linus Walleij <linus.walleij@...aro.org>,
Bartosz Golaszewski <brgl@...ev.pl>,
Thierry Reding <thierry.reding@...il.com>,
Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
Lee Jones <lee.jones@...aro.org>,
"Kamal Dasu" <kdasu.kdev@...il.com>,
Florian Fainelli <f.fainelli@...il.com>,
<bcm-kernel-feedback-list@...adcom.com>,
Peter Korsgaard <peter@...sgaard.com>,
Andrew Lunn <andrew@...n.ch>,
Ulf Hansson <ulf.hansson@...aro.org>,
Brian Norris <computersforpeace@...il.com>,
"Miquel Raynal" <miquel.raynal@...tlin.com>,
Richard Weinberger <richard@....at>,
Vignesh Raghavendra <vigneshr@...com>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Joakim Zhang <qiangqing.zhang@....com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>,
Kishon Vijay Abraham I <kishon@...com>,
Vinod Koul <vkoul@...nel.org>,
Benson Leung <bleung@...omium.org>,
"Guenter Roeck" <groeck@...omium.org>,
Zha Qipeng <qipeng.zha@...el.com>,
Hans de Goede <hdegoede@...hat.com>,
Mark Gross <markgross@...nel.org>,
John Garry <john.garry@...wei.com>,
Mark Brown <broonie@...nel.org>,
Matthias Brugger <matthias.bgg@...il.com>,
Niklas Söderlund <niklas.soderlund@...natech.se>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Amit Kucheria <amitk@...nel.org>,
Zhang Rui <rui.zhang@...el.com>,
Jiri Slaby <jirislaby@...nel.org>,
Eric Auger <eric.auger@...hat.com>,
Alex Williamson <alex.williamson@...hat.com>,
Cornelia Huck <cohuck@...hat.com>,
"Liam Girdwood" <lgirdwood@...il.com>,
Jaroslav Kysela <perex@...ex.cz>,
"Takashi Iwai" <tiwai@...e.com>,
<openipmi-developer@...ts.sourceforge.net>,
<linux-iio@...r.kernel.org>, <linux-gpio@...r.kernel.org>,
<linux-pwm@...r.kernel.org>, <linux-i2c@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-mmc@...r.kernel.org>, <linux-mtd@...ts.infradead.org>,
<netdev@...r.kernel.org>, <linux-renesas-soc@...r.kernel.org>,
<linux-phy@...ts.infradead.org>,
<platform-driver-x86@...r.kernel.org>, <linux-spi@...r.kernel.org>,
<linux-mediatek@...ts.infradead.org>, <linux-pm@...r.kernel.org>,
<linux-serial@...r.kernel.org>, <kvm@...r.kernel.org>,
<alsa-devel@...a-project.org>,
Matthias Schiffer <matthias.schiffer@...tq-group.com>
Subject: Re: [PATCH v2 1/2] platform: make platform_get_irq_optional()
optional
Hello!
On 2/14/22 11:54 AM, Geert Uytterhoeven wrote:
[...]
>> This patch is based on the former Andy Shevchenko's patch:
>>
>> https://lore.kernel.org/lkml/20210331144526.19439-1-andriy.shevchenko@linux.intel.com/
>>
>> Currently platform_get_irq_optional() returns an error code even if IRQ
>> resource simply has not been found. It prevents the callers from being
>> error code agnostic in their error handling:
>>
>> ret = platform_get_irq_optional(...);
>> if (ret < 0 && ret != -ENXIO)
>> return ret; // respect deferred probe
>> if (ret > 0)
>> ...we get an IRQ...
>>
>> All other *_optional() APIs seem to return 0 or NULL in case an optional
>> resource is not available. Let's follow this good example, so that the
>> callers would look like:
>>
>> ret = platform_get_irq_optional(...);
>> if (ret < 0)
>> return ret;
>> if (ret > 0)
>> ...we get an IRQ...
>>
>> Reported-by: Matthias Schiffer <matthias.schiffer@...tq-group.com>
>> Signed-off-by: Sergey Shtylyov <s.shtylyov@....ru>
>> ---
>> Changes in version 2:
>
> Thanks for the update!
>
>> drivers/base/platform.c | 60 +++++++++++++++---------
>
> The core change LGTM.
Thanx! :-)
> I'm only looking at Renesas drivers below...
>
>> --- a/drivers/mmc/host/sh_mmcif.c
>> +++ b/drivers/mmc/host/sh_mmcif.c
>> @@ -1465,14 +1465,14 @@ static int sh_mmcif_probe(struct platform_device *pdev)
>> sh_mmcif_sync_reset(host);
>> sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL);
>>
>> - name = irq[1] < 0 ? dev_name(dev) : "sh_mmc:error";
>> + name = irq[1] <= 0 ? dev_name(dev) : "sh_mmc:error";
>
> "== 0" should be sufficient here, if the code above would bail out
> on errors returned by platform_get_irq_optional(), which it currently
> doesn't do.
> As this adds missing error handling, this is to be fixed by a separate
> patch later?
Yes.
[...]
>> ret = devm_request_threaded_irq(dev, irq[1],
>> sh_mmcif_intr, sh_mmcif_irqt,
>> 0, "sh_mmc:int", host);
>
>> --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
>> +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
>> @@ -439,7 +439,7 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
>> u32 val;
>> int ret;
>>
>> - if (!rcar_gen3_is_any_rphy_initialized(channel) && channel->irq >= 0) {
>> + if (!rcar_gen3_is_any_rphy_initialized(channel) && channel->irq > 0) {
>> INIT_WORK(&channel->work, rcar_gen3_phy_usb2_work);
>> ret = request_irq(channel->irq, rcar_gen3_phy_usb2_irq,
>> IRQF_SHARED, dev_name(channel->dev), channel);
>> @@ -486,7 +486,7 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p)
>> val &= ~USB2_INT_ENABLE_UCOM_INTEN;
>> writel(val, usb2_base + USB2_INT_ENABLE);
>>
>> - if (channel->irq >= 0 && !rcar_gen3_is_any_rphy_initialized(channel))
>> + if (channel->irq > 0 && !rcar_gen3_is_any_rphy_initialized(channel))
>> free_irq(channel->irq, channel);
>>
>> return 0;
>
> LGTM, but note that all errors returned by platform_get_irq_optional()
> are currently ignored, even real errors, which should be propagated
> up.
> As this adds missing error handling, this is to be fixed by a separate
> patch later?
Yes.
>> --- a/drivers/thermal/rcar_gen3_thermal.c
>> +++ b/drivers/thermal/rcar_gen3_thermal.c
>> @@ -432,6 +432,8 @@ static int rcar_gen3_thermal_request_irqs(struct rcar_gen3_thermal_priv *priv,
>> irq = platform_get_irq_optional(pdev, i);
>> if (irq < 0)
>> return irq;
>> + if (!irq)
>> + return -ENXIO;
>
> While correct, and preserving existing behavior, this looks strange
> to me. Probably this should return zero instead (i.e. the check
> above should be changed to "<= 0"), and the caller should start caring
> about and propagating up real errors.
Hm, you're right... should be <= 0 there, it seems.
> As this adds missing error handling, this is to be fixed by a separate
> patch later?
Propagating errors from the probe() method is a matter of separate patch, yes.
>>
>> irqname = devm_kasprintf(dev, GFP_KERNEL, "%s:ch%d",
>> dev_name(dev), i);
>> diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
>> index fb65dc601b23..328ab074fd89 100644
>
>> --- a/drivers/tty/serial/sh-sci.c
>> +++ b/drivers/tty/serial/sh-sci.c
>
> I think you missed
>
> #define SCIx_IRQ_IS_MUXED(port) \
> ((port)->irqs[SCIx_ERI_IRQ] == \
> (port)->irqs[SCIx_RXI_IRQ]) || \
> ((port)->irqs[SCIx_ERI_IRQ] && \
> ((port)->irqs[SCIx_RXI_IRQ] < 0))
>
> above? The last condition should become "<= 0".
Yes, probably... TY!
> Gr{oetje,eeting}s,
>
> Geert
MBR, Sergey
Powered by blists - more mailing lists