From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Aditya Pakki <pakki001@umn.edu>
Cc: kjlu@umn.edu, Andreas Noever <andreas.noever@gmail.com>,
Michael Jamet <michael.jamet@intel.com>,
Yehezkel Bernat <YehezkelShB@gmail.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] thunderbolt: Fix to check return value of ida_simple_get
Date: Wed, 20 Mar 2019 18:29:24 +0200 [thread overview]
Message-ID: <20190320162924.GA3622@lahna.fi.intel.com> (raw)
In-Reply-To: <20190320162446.30500-1-pakki001@umn.edu>
On Wed, Mar 20, 2019 at 11:24:45AM -0500, Aditya Pakki wrote:
> In enumerate_services, ida_simple_get on failure can return an error and
> leaks memory during device_register failure. The patch ensures that
> the dev_set_name is set on non failure cases, and releases memory in
> case of failure.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
>
> ---
> v1: Missed cleanup of svc in case of allocation failure and
> device_register failure.
> ---
> drivers/thunderbolt/xdomain.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
> index e27dd8beb94b..eb08275185bf 100644
> --- a/drivers/thunderbolt/xdomain.c
> +++ b/drivers/thunderbolt/xdomain.c
> @@ -740,6 +740,7 @@ static void enumerate_services(struct tb_xdomain *xd)
> struct tb_service *svc;
> struct tb_property *p;
> struct device *dev;
> + int id;
>
> /*
> * First remove all services that are not available anymore in
> @@ -768,7 +769,12 @@ static void enumerate_services(struct tb_xdomain *xd)
> break;
> }
>
> - svc->id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL);
> + id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL);
> + if (id < 0) {
> + kfree(svc);
> + break;
> + }
> + svc->id = id;
> svc->dev.bus = &tb_bus_type;
> svc->dev.type = &tb_service_type;
> svc->dev.parent = &xd->dev;
> @@ -776,6 +782,7 @@ static void enumerate_services(struct tb_xdomain *xd)
>
> if (device_register(&svc->dev)) {
> put_device(&svc->dev);
> + kfree(svc);
You can't do this after device_register() is called. The put_device()
above is sufficient.
next prev parent reply other threads:[~2019-03-20 16:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 16:24 [PATCH v2] thunderbolt: Fix to check return value of ida_simple_get Aditya Pakki
2019-03-20 16:29 ` Mika Westerberg [this message]
2019-03-20 20:39 ` Mukesh Ojha
2019-03-21 5:49 ` Mika Westerberg
2019-03-22 7:31 ` Mukesh Ojha
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=20190320162924.GA3622@lahna.fi.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=YehezkelShB@gmail.com \
--cc=andreas.noever@gmail.com \
--cc=kjlu@umn.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.jamet@intel.com \
--cc=pakki001@umn.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).