mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Jesper Juhl <jj@chaosbits.net>
Cc: linux-kernel@vger.kernel.org, James Bottomley <James.Bottomley@suse.de>
Subject: Re: [PATCH] target: Fix memory leak in fd_set_configfs_dev_params().
Date: Sun, 16 Jan 2011 14:54:16 -0800	[thread overview]
Message-ID: <1295218456.22813.61.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <alpine.LNX.2.00.1101162006410.13377@swampdragon.chaosbits.net>

On Sun, 2011-01-16 at 20:17 +0100, Jesper Juhl wrote:
> match_strdup() dynamically allocates memory and it is the responsabillity 
> of the caller to free that memory. In 
> drivers/target/target_core_file.c::fd_set_configfs_dev_params() two calls 
> are made to match_strdup() and in neither case is the allocated memory 
> freed, but instead it is leaked.
> 
> This patch should take care of the problem by kfree()'ing the allocated 
> memory once it is no longer needed. It also makes sure to return -ENOMEM 
> if the memory allocation in match_strdup() should fail.
> 
> Please review and consider for inclusion.
> 
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>

Ugh, this was my fault during the recent v4.0 configfs parameter
conversion.  Committed as 5c45b37 in lio-core-2.6.git/linus-38-rc1 and I
will fix up the other handful of match_strdup() breakage and carry into
scsi-post-merge-2.6.git/for-jejb shortly.

Thanks for catching this..

--nab

> ---
>  target_core_file.c |   13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
>   compile tested only.
> 
> diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
> index 0aaca88..676a010 100644
> --- a/drivers/target/target_core_file.c
> +++ b/drivers/target/target_core_file.c
> @@ -537,15 +537,26 @@ static ssize_t fd_set_configfs_dev_params(
>  		token = match_token(ptr, tokens, args);
>  		switch (token) {
>  		case Opt_fd_dev_name:
> +			arg_p = match_strdup(&args[0]);
> +			if (!arg_p) {
> +				ret = -ENOMEM;
> +				break;
> +			}
>  			snprintf(fd_dev->fd_dev_name, FD_MAX_DEV_NAME,
> -					"%s", match_strdup(&args[0]));
> +					"%s", arg_p);
> +			kfree(arg_p);
>  			printk(KERN_INFO "FILEIO: Referencing Path: %s\n",
>  					fd_dev->fd_dev_name);
>  			fd_dev->fbd_flags |= FBDF_HAS_PATH;
>  			break;
>  		case Opt_fd_dev_size:
>  			arg_p = match_strdup(&args[0]);
> +			if (!arg_p) {
> +				ret = -ENOMEM;
> +				break;
> +			}
>  			ret = strict_strtoull(arg_p, 0, &fd_dev->fd_dev_size);
> +			kfree(arg_p);
>  			if (ret < 0) {
>  				printk(KERN_ERR "strict_strtoull() failed for"
>  						" fd_dev_size=\n");
> 
> 


  reply	other threads:[~2011-01-16 22:54 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-16 19:17 Jesper Juhl
2011-01-16 22:54 ` Nicholas A. Bellinger [this message]
2011-01-16 22:59   ` Jesper Juhl
2011-01-16 23:19     ` Nicholas A. Bellinger
2011-01-17 18:29       ` Jesper Juhl
2011-01-17 22:16         ` Nicholas A. Bellinger
2011-01-17 22:21           ` Jesper Juhl

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=1295218456.22813.61.camel@haakon2.linux-iscsi.org \
    --to=nab@linux-iscsi.org \
    --cc=James.Bottomley@suse.de \
    --cc=jj@chaosbits.net \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®