From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Dinh Nguyen To: stable@vger.kernel.org Cc: dinguyen@kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org, Heiner Kallweit , Philipp Zabel Subject: [PATCHv2 for v4.19-stable 2/6] reset: core: fix reset_control_put Date: Tue, 4 Dec 2018 09:34:44 -0600 Message-Id: <20181204153448.6189-3-dinguyen@kernel.org> In-Reply-To: <20181204153448.6189-1-dinguyen@kernel.org> References: <20181204153448.6189-1-dinguyen@kernel.org> List-ID: From: Heiner Kallweit 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 Signed-off-by: Philipp Zabel --- 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