All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: Vitaliy Ivanov <vitalivanov@gmail.com>
Cc: Jeff Dike <jdike@addtoit.com>,
	user-mode-linux-devel@lists.sourceforge.net,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/3] uml: drivers/net_user.c memory leak fix
Date: Thu, 7 Jul 2011 19:27:15 +0200	[thread overview]
Message-ID: <201107071927.16237.richard@nod.at> (raw)
In-Reply-To: <1310056562.3528.49.camel@vivanov>

Am Donnerstag 07 Juli 2011, 18:36:02 schrieb Vitaliy Ivanov:
> >From 9b9f36f46aa708c3245f5ded83f96421966b2edf Mon Sep 17 00:00:00 2001
> 
> From: Vitaliy Ivanov <vitalivanov@gmail.com>
> Date: Thu, 7 Jul 2011 19:23:13 +0300
> Subject: [PATCH 1/3] uml: drivers/net_user.c memory leak fix
> 
> Perform memory cleanup on exit.
> On receiving invalid 'pid' we still should clean 'output' variable.
> 
> Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
> ---
>  arch/um/drivers/net_user.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
> index 9415dd9..989b653 100644
> --- a/arch/um/drivers/net_user.c
> +++ b/arch/um/drivers/net_user.c
> @@ -228,10 +228,11 @@ static void change(char *dev, char *what, unsigned
> char *addr, "buffer\n");
> 
>  	pid = change_tramp(argv, output, output_len);
> -	if (pid < 0) return;
> 
>  	if (output != NULL) {
> -		printk("%s", output);
> +		if (pid >= 0) {
> +			printk("%s", output);
> +		}
>  		kfree(output);
>  	}
>  }

This control logic is a bit strange.
When change_tramp() fails we should not printk() the output variable.

if (pid < 0){
 free(output);
 return;
}

Would be much cleaner.

Thanks,
//richard

  reply	other threads:[~2011-07-07 17:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07 16:36 [uml-devel] [PATCH 1/3] uml: drivers/net_user.c memory leak fix Vitaliy Ivanov
2011-07-07 16:36 ` Vitaliy Ivanov
2011-07-07 17:27 ` Richard Weinberger [this message]
2011-07-08 10:30   ` Vitaliy Ivanov
2011-07-08 10:30     ` Vitaliy Ivanov
2011-07-08 10:44     ` [uml-devel] " Richard Weinberger
2011-07-08 10:44       ` Richard Weinberger
2011-07-08 13:00       ` Vitaliy Ivanov
2011-07-08 13:00         ` Vitaliy Ivanov
2011-07-08 15:42         ` Richard Weinberger

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=201107071927.16237.richard@nod.at \
    --to=richard@nod.at \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=user-mode-linux-devel@lists.sourceforge.net \
    --cc=vitalivanov@gmail.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.