| 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
| ||
|
Date: Mon, 17 Jan 2022 14:57:32 +0300
From: Sergey Shtylyov <s.shtylyov@....ru>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J. Wysocki" <rafael@...nel.org>,
<linux-kernel@...r.kernel.org>
CC: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Corey Minyard <minyard@....org>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
"William Breathitt Gray" <vilhelm.gray@...il.com>,
Khuong Dinh <khuong@...amperecomputing.com>,
Borislav Petkov <bp@...en8.de>,
"Mauro Carvalho Chehab" <mchehab@...nel.org>,
Tony Luck <tony.luck@...el.com>,
"James Morse" <james.morse@....com>,
Robert Richter <rric@...nel.org>,
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>,
Saravanan Sekar <sravanhome@...il.com>,
Sebastian Reichel <sre@...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-edac@...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-pm@...r.kernel.org>,
<linux-spi@...r.kernel.org>, <linux-mediatek@...ts.infradead.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 1/2] platform: make platform_get_irq_optional() optional
On 1/10/22 10:54 PM, Sergey Shtylyov 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>
[...]
Please don't merge this as yet, I'm going thru this patch once again
and have already found some sloppy code. :-/
> diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
> index 7450904e330a..fdc63bfa5be4 100644
> --- a/drivers/char/ipmi/bt-bmc.c
> +++ b/drivers/char/ipmi/bt-bmc.c
> @@ -382,12 +382,14 @@ static int bt_bmc_config_irq(struct bt_bmc *bt_bmc,
> bt_bmc->irq = platform_get_irq_optional(pdev, 0);
> if (bt_bmc->irq < 0)
> return bt_bmc->irq;
> + if (!bt_bmc->irq)
> + return 0;
Hm, this is sloppy. Will recast and rebase to the -next branch.
>
> rc = devm_request_irq(dev, bt_bmc->irq, bt_bmc_irq, IRQF_SHARED,
> DEVICE_NAME, bt_bmc);
> if (rc < 0) {
> dev_warn(dev, "Unable to request IRQ %d\n", bt_bmc->irq);
> - bt_bmc->irq = rc;
> + bt_bmc->irq = 0;
This change isn't needed...
> return rc;
> }
>
[...]
> diff --git a/drivers/edac/xgene_edac.c b/drivers/edac/xgene_edac.c
> index 2ccd1db5e98f..0d1bdd27cd78 100644
> --- a/drivers/edac/xgene_edac.c
> +++ b/drivers/edac/xgene_edac.c
> @@ -1917,7 +1917,7 @@ static int xgene_edac_probe(struct platform_device *pdev)
>
> for (i = 0; i < 3; i++) {
> irq = platform_get_irq_optional(pdev, i);
Is *_optinal() even correct here?
> - if (irq < 0) {
> + if (irq <= 0) {
> dev_err(&pdev->dev, "No IRQ resource\n");
> rc = -EINVAL;
> goto out_err;
[...]
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index f75929783b94..ac222985efde 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -1521,7 +1521,7 @@ static irqreturn_t brcmnand_ctlrdy_irq(int irq, void *data)
>
> /* check if you need to piggy back on the ctrlrdy irq */
> if (ctrl->edu_pending) {
> - if (irq == ctrl->irq && ((int)ctrl->edu_irq >= 0))
> + if (irq == ctrl->irq && ((int)ctrl->edu_irq > 0))
Note to self: the cast to *int* isn't needed, the edu_irq field is *int* already...
[...]
> diff --git a/drivers/power/supply/mp2629_charger.c b/drivers/power/supply/mp2629_charger.c
> index bdf924b73e47..51289700a7ac 100644
> --- a/drivers/power/supply/mp2629_charger.c
> +++ b/drivers/power/supply/mp2629_charger.c
> @@ -581,9 +581,9 @@ static int mp2629_charger_probe(struct platform_device *pdev)
> platform_set_drvdata(pdev, charger);
>
> irq = platform_get_irq_optional(to_platform_device(dev->parent), 0);
Again, is *_optional() even correct here?
> - if (irq < 0) {
> + if (irq <= 0) {
> dev_err(dev, "get irq fail: %d\n", irq);
> - return irq;
> + return irq < 0 ? irq : -ENXIO;
> }
>
> for (i = 0; i < MP2629_MAX_FIELD; i++) {
[...]
> diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c
> index 43eb25b167bc..776cfed4339c 100644
> --- a/drivers/thermal/rcar_gen3_thermal.c
> +++ b/drivers/thermal/rcar_gen3_thermal.c
> @@ -430,7 +430,7 @@ static int rcar_gen3_thermal_request_irqs(struct rcar_gen3_thermal_priv *priv,
>
> for (i = 0; i < 2; i++) {
> irq = platform_get_irq_optional(pdev, i);
> - if (irq < 0)
> + if (irq <= 0)
> return irq;
Sloppy code again? We shouldn't return 0...
[...]
> diff --git a/drivers/vfio/platform/vfio_platform.c b/drivers/vfio/platform/vfio_platform.c
> index 68a1c87066d7..cd7494933563 100644
> --- a/drivers/vfio/platform/vfio_platform.c
> +++ b/drivers/vfio/platform/vfio_platform.c
> @@ -32,8 +32,12 @@ static struct resource *get_platform_resource(struct vfio_platform_device *vdev,
> static int get_platform_irq(struct vfio_platform_device *vdev, int i)
> {
> struct platform_device *pdev = (struct platform_device *) vdev->opaque;
> + int ret;
>
> - return platform_get_irq_optional(pdev, i);
> + ret = platform_get_irq_optional(pdev, i);
> + if (ret < 0)
> + return ret;
> + return ret > 0 ? ret : -ENXIO;
Could be expressed more concisely:
return ret ? : -ENXIO;
just like vfio_amba.c does it...
[...]
MBR, Sergey
Powered by blists - more mailing lists