From: Alexey Khoroshilov <khoroshilov@ispras.ru>
To: Joachim Eastwood <manabian@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Boris Brezillon <boris.brezillon@bootlin.com>
Cc: Alexey Khoroshilov <khoroshilov@ispras.ru>,
Richard Weinberger <richard@nod.at>,
linux-arm-kernel@lists.infradead.org,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
ldv-project@linuxtesting.org, Julia Lawall <julia.lawall@lip6.fr>,
sil2review@lists.osadl.org
Subject: [PATCH] mtd: nxp-spifi: decrement flash_np refcnt on error paths
Date: Tue, 8 May 2018 23:47:36 +0300 [thread overview]
Message-ID: <1525812456-25877-1-git-send-email-khoroshilov@ispras.ru> (raw)
nxp_spifi_probe() increments refcnt of SPI flash device node by
of_get_next_available_child() and then it passes the node
to mtd device in nxp_spifi_setup_flash().
But if a failure happens before mtd_device_register() succeed,
the refcnt is left undecremented.
Found by Linux Driver Verification project (linuxtesting.org).
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
drivers/mtd/spi-nor/nxp-spifi.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/spi-nor/nxp-spifi.c b/drivers/mtd/spi-nor/nxp-spifi.c
index 15374216d4d9..8919e31f2ab8 100644
--- a/drivers/mtd/spi-nor/nxp-spifi.c
+++ b/drivers/mtd/spi-nor/nxp-spifi.c
@@ -294,7 +294,8 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi,
break;
default:
dev_err(spifi->dev, "unsupported rx-bus-width\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_node_put;
}
}
@@ -328,7 +329,8 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi,
break;
default:
dev_err(spifi->dev, "only mode 0 and 3 supported\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto err_node_put;
}
writel(ctrl, spifi->io_base + SPIFI_CTRL);
@@ -356,22 +358,26 @@ static int nxp_spifi_setup_flash(struct nxp_spifi *spifi,
ret = spi_nor_scan(&spifi->nor, NULL, &hwcaps);
if (ret) {
dev_err(spifi->dev, "device scan failed\n");
- return ret;
+ goto err_node_put;
}
ret = nxp_spifi_setup_memory_cmd(spifi);
if (ret) {
dev_err(spifi->dev, "memory command setup failed\n");
- return ret;
+ goto err_node_put;
}
ret = mtd_device_register(&spifi->nor.mtd, NULL, 0);
if (ret) {
dev_err(spifi->dev, "mtd device parse failed\n");
- return ret;
+ goto err_node_put;
}
return 0;
+
+err_node_put:
+ of_node_put(np);
+ return ret;
}
static int nxp_spifi_probe(struct platform_device *pdev)
--
2.7.4
next reply other threads:[~2018-05-08 20:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-08 20:47 Alexey Khoroshilov [this message]
2018-05-09 9:42 ` [PATCH] mtd: nxp-spifi: decrement flash_np refcnt on error paths Boris Brezillon
2018-05-09 14:35 ` Alexey Khoroshilov
2018-05-09 14:39 ` Boris Brezillon
2018-05-09 14:56 ` [PATCH v2] mtd: nxp-spifi: release flash_np in nxp_spifi_probe() Alexey Khoroshilov
2018-05-09 15:03 ` Boris Brezillon
2018-05-09 15:11 ` [PATCH v3] " Alexey Khoroshilov
2018-07-07 6:58 ` Boris Brezillon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1525812456-25877-1-git-send-email-khoroshilov@ispras.ru \
--to=khoroshilov@ispras.ru \
--cc=boris.brezillon@bootlin.com \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=julia.lawall@lip6.fr \
--cc=ldv-project@linuxtesting.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=manabian@gmail.com \
--cc=marek.vasut@gmail.com \
--cc=richard@nod.at \
--cc=sil2review@lists.osadl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).