From: Dan Carpenter <dan.carpenter@linaro.org>
To: Abhijit Gangurde <abhijit.gangurde@amd.com>
Cc: Nipun Gupta <nipun.gupta@amd.com>,
Nikhil Agarwal <nikhil.agarwal@amd.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH v2 2/2] cdx: Unlock on error path in rescan_store()
Date: Tue, 2 Jan 2024 16:11:16 +0300 [thread overview]
Message-ID: <a7994b47-6f78-4e2c-a30a-ee5995d428ec@moroto.mountain> (raw)
In-Reply-To: <2e66efc4-a13a-4774-8c9d-763455fe4834@moroto.mountain>
We added locking to this function but these two error paths were
accidentally overlooked.
Fixes: f0af81683466 ("cdx: Introduce lock to protect controller ops")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
v2: I rebased this patch on top of the other bugfix that Christophe
JAILLET pointed out. It's easier for backporting to do it in this
order.
drivers/cdx/cdx.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c
index 40035dd2e299..7c1c1f82a326 100644
--- a/drivers/cdx/cdx.c
+++ b/drivers/cdx/cdx.c
@@ -575,7 +575,8 @@ static ssize_t rescan_store(const struct bus_type *bus,
pd = of_find_device_by_node(np);
if (!pd) {
of_node_put(np);
- return -EINVAL;
+ count = -EINVAL;
+ goto unlock;
}
cdx = platform_get_drvdata(pd);
@@ -585,6 +586,7 @@ static ssize_t rescan_store(const struct bus_type *bus,
put_device(&pd->dev);
}
+unlock:
mutex_unlock(&cdx_controller_lock);
return count;
--
2.42.0
next prev parent reply other threads:[~2024-01-02 13:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 13:10 [PATCH v2 1/2] cdx: call of_node_put() on error path Dan Carpenter
2024-01-02 13:11 ` Dan Carpenter [this message]
2024-01-04 9:06 ` [PATCH v2 2/2] cdx: Unlock on error path in rescan_store() Gangurde, Abhijit
2024-01-04 9:06 ` [PATCH v2 1/2] cdx: call of_node_put() on error path Gangurde, Abhijit
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=a7994b47-6f78-4e2c-a30a-ee5995d428ec@moroto.mountain \
--to=dan.carpenter@linaro.org \
--cc=abhijit.gangurde@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nikhil.agarwal@amd.com \
--cc=nipun.gupta@amd.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 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.