4.9-stable review patch. If anyone has any objections, please let me know.
------------------
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 Cc: Dinh Nguyen dinguyen@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
--- drivers/reset/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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);