From: Johan Hovold <johan@kernel.org>
To: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: linux-kernel@vger.kernel.org, Johan Hovold <johan@kernel.org>
Subject: Re: [PATCH] stm class: fix device leak in open error path
Date: Thu, 17 Nov 2016 15:38:22 +0100 [thread overview]
Message-ID: <20161117143822.GB10490@localhost> (raw)
In-Reply-To: <1477997094-29192-1-git-send-email-johan@kernel.org>
On Tue, Nov 01, 2016 at 11:44:54AM +0100, Johan Hovold wrote:
> Make sure to drop the reference taken by class_find_device() also on
> allocation errors in open().
>
> Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for...")
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
> drivers/hwtracing/stm/core.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
> index 51f81d64ca37..47811f5c9bc9 100644
> --- a/drivers/hwtracing/stm/core.c
> +++ b/drivers/hwtracing/stm/core.c
> @@ -368,8 +368,10 @@ static int stm_char_open(struct inode *inode, struct file *file)
> return -ENODEV;
>
> stmf = kzalloc(sizeof(*stmf), GFP_KERNEL);
> - if (!stmf)
> - return -ENOMEM;
> + if (!stmf) {
> + err = -ENOMEM;
> + goto err_put_device;
> + }
>
> stm_output_init(&stmf->output);
> stmf->stm = to_stm_device(dev);
> @@ -382,9 +384,10 @@ static int stm_char_open(struct inode *inode, struct file *file)
> return nonseekable_open(inode, file);
>
> err_free:
> + kfree(stmf);
> +err_put_device:
> /* matches class_find_device() above */
> put_device(dev);
> - kfree(stmf);
>
> return err;
> }
Any comments to this one, Alexander?
Thanks,
Johan
next prev parent reply other threads:[~2016-11-17 18:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-01 10:44 [PATCH] stm class: fix device leak in open error path Johan Hovold
2016-11-17 14:38 ` Johan Hovold [this message]
2016-11-18 11:55 ` Alexander Shishkin
2016-11-18 13:01 ` Johan Hovold
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=20161117143822.GB10490@localhost \
--to=johan@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
/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.