From: Dinh Nguyen <dinguyen@kernel.org>
To: stable@vger.kernel.org
Cc: dinguyen@kernel.org, gregkh@linuxfoundation.org,
sashal@kernel.org, Heiner Kallweit <hkallweit1@gmail.com>,
Philipp Zabel <p.zabel@pengutronix.de>
Subject: [PATCHv2 for v4.19-stable 2/6] reset: core: fix reset_control_put
Date: Tue, 4 Dec 2018 09:34:44 -0600 [thread overview]
Message-ID: <20181204153448.6189-3-dinguyen@kernel.org> (raw)
In-Reply-To: <20181204153448.6189-1-dinguyen@kernel.org>
From: Heiner Kallweit <hkallweit1@gmail.com>
commit 4891486fb2c80eaf3bb0f9eb065d15ecd357702f upstream.
Commit "reset: make optional functions really optional" missed to
adjust one check in reset_control_put, causing a NULL pointer
access for optional resets.
Fixes: bb475230b8e5 "reset: make optional functions really optional"
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/reset/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 75821417b799..f62f57ebc45a 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -358,7 +358,7 @@ EXPORT_SYMBOL_GPL(__of_reset_control_get);
void reset_control_put(struct reset_control *rstc)
{
- if (IS_ERR(rstc))
+ if (IS_ERR_OR_NULL(rstc))
return;
mutex_lock(&reset_list_mutex);
--
2.17.1
next prev parent reply other threads:[~2018-12-04 15:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-04 15:34 [PATCHv2 for v4.19-stable 0/6] reset: make optional functions Dinh Nguyen
2018-12-04 15:34 ` [PATCHv2 for v4.19-stable 1/6] reset: make optional functions really optional Dinh Nguyen
2018-12-04 15:34 ` Dinh Nguyen [this message]
2018-12-04 15:34 ` [PATCHv2 for v4.19-stable 3/6] reset: fix optional reset_control_get stubs to return NULL Dinh Nguyen
2018-12-04 15:34 ` [PATCHv2 for v4.19-stable 4/6] reset: add exported __reset_control_get, return NULL if optional Dinh Nguyen
2018-12-04 15:34 ` [PATCHv2 for v4.19-stable 5/6] reset: make device_reset_optional() really optional Dinh Nguyen
2018-12-04 15:34 ` [PATCHv2 for v4.19-stable 6/6] reset: remove remaining WARN_ON() in <linux/reset.h> Dinh Nguyen
2018-12-04 15:45 ` [PATCHv2 for v4.19-stable 0/6] reset: make optional functions Greg KH
2018-12-04 15:45 ` Greg KH
2018-12-04 17:27 ` Dinh Nguyen
2018-12-06 11:01 ` Greg KH
2018-12-06 15:17 ` Dinh Nguyen
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=20181204153448.6189-3-dinguyen@kernel.org \
--to=dinguyen@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hkallweit1@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.