From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Nicholas Mc Guire <hofrat@osadl.org>,
Wei Xu <xuwei5@hisilicon.com>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 4.4 06/20] ARM: hisi: handle of_iomap and fix missing of_node_put
Date: Sat, 15 Sep 2018 01:35:09 +0000 [thread overview]
Message-ID: <20180915013502.180110-6-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180915013502.180110-1-alexander.levin@microsoft.com>
From: Nicholas Mc Guire <hofrat@osadl.org>
[ Upstream commit d396cb185c0337aae5664b250cdd9a73f6eb1503 ]
Relying on an unchecked of_iomap() which can return NULL is problematic
here, an explicit check seems mandatory. Also the call to
of_find_compatible_node() returns a device node with refcount incremented
therefor an explicit of_node_put() is needed here.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: commit 22bae4290457 ("ARM: hi3xxx: add hotplug support")
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
arch/arm/mach-hisi/hotplug.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index a129aae72602..3f28c9141b48 100644
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -148,13 +148,20 @@ static int hi3xxx_hotplug_init(void)
struct device_node *node;
node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
- if (node) {
- ctrl_base = of_iomap(node, 0);
- id = HI3620_CTRL;
- return 0;
+ if (!node) {
+ id = ERROR_CTRL;
+ return -ENOENT;
}
- id = ERROR_CTRL;
- return -ENOENT;
+
+ ctrl_base = of_iomap(node, 0);
+ of_node_put(node);
+ if (!ctrl_base) {
+ id = ERROR_CTRL;
+ return -ENOMEM;
+ }
+
+ id = HI3620_CTRL;
+ return 0;
}
void hi3xxx_set_cpu(int cpu, bool enable)
--
2.17.1
next prev parent reply other threads:[~2018-09-15 1:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-15 1:35 [PATCH AUTOSEL 4.4 01/20] binfmt_elf: Respect error return from `regset->active' Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 02/20] audit: fix use-after-free in audit_add_watch Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 03/20] mtdchar: fix overflows in adjustment of `count` Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 04/20] mtd: rawnand: sunxi: Add an U suffix to NFC_PAGE_OP definition Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 05/20] MIPS: loongson64: cs5536: Fix PCI_OHCI_INT_REG reads Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 07/20] ARM: hisi: fix error handling and missing of_node_put Sasha Levin
2018-09-15 1:35 ` Sasha Levin [this message]
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 09/20] drm/nouveau: tegra: Detach from ARM DMA/IOMMU mapping Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 08/20] ARM: hisi: check of_iomap and fix missing of_node_put Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 10/20] parport: sunbpp: fix error return code Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 11/20] coresight: Handle errors in finding input/output ports Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 12/20] coresight: tpiu: Fix disabling timeouts Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 13/20] gpiolib: Mark gpio_suffixes array with __maybe_unused Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 14/20] drm/amdkfd: Fix error codes in kfd_get_process Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 15/20] rtc: bq4802: add error handling for devm_ioremap Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 16/20] ALSA: pcm: Fix snd_interval_refine first/last with open min/max Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 17/20] selftest: timers: Tweak raw_skew to SKIP when ADJ_OFFSET/other clock adjustments are in progress Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 18/20] drm/panel: type promotion bug in s6e8aa0_read_mtp_id() Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 19/20] IB/nes: Fix a compiler warning Sasha Levin
2018-09-15 1:35 ` [PATCH AUTOSEL 4.4 20/20] pinctrl: qcom: spmi-gpio: Fix pmic_gpio_config_get() to be compliant Sasha Levin
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=20180915013502.180110-6-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=hofrat@osadl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=xuwei5@hisilicon.com \
/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).