| From 60db0cfca7baaf4be7f3f9352aa43acb32557e02 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 7 Jun 2021 10:26:15 +0200 |
| Subject: reset: bail if try_module_get() fails |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Philipp Zabel <p.zabel@pengutronix.de> |
| |
| [ Upstream commit 4fb26fb83f0def3d39c14e268bcd4003aae8fade ] |
| |
| Abort instead of returning a new reset control for a reset controller |
| device that is going to have its module unloaded. |
| |
| Reported-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| Fixes: 61fc41317666 ("reset: Add reset controller API") |
| Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| Link: https://lore.kernel.org/r/20210607082615.15160-1-p.zabel@pengutronix.de |
| Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/reset/core.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/reset/core.c b/drivers/reset/core.c |
| index dbf881b586d9..fd7e1a3525f4 100644 |
| --- a/drivers/reset/core.c |
| +++ b/drivers/reset/core.c |
| @@ -640,7 +640,10 @@ static struct reset_control *__reset_control_get_internal( |
| if (!rstc) |
| return ERR_PTR(-ENOMEM); |
| |
| - try_module_get(rcdev->owner); |
| + if (!try_module_get(rcdev->owner)) { |
| + kfree(rstc); |
| + return ERR_PTR(-ENODEV); |
| + } |
| |
| rstc->rcdev = rcdev; |
| list_add(&rstc->list, &rcdev->reset_control_head); |
| -- |
| 2.30.2 |
| |
