From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752104Ab1GHKo7 (ORCPT <rfc822;w@1wt.eu>);
	Fri, 8 Jul 2011 06:44:59 -0400
Received: from a.ns.miles-group.at ([95.130.255.143]:59898 "EHLO radon.swed.at"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751934Ab1GHKo6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 8 Jul 2011 06:44:58 -0400
From: Richard Weinberger <richard@nod.at>
To: Vitaliy Ivanov <vitalivanov@gmail.com>
Subject: Re: [PATCH 1/3] uml: drivers/net_user.c memory leak fix
Date: Fri, 8 Jul 2011 12:44:53 +0200
User-Agent: KMail/1.13.7 (Linux/2.6.37.6-0.5-desktop; KDE/4.6.5; x86_64; ; )
Cc: Jeff Dike <jdike@addtoit.com>, user-mode-linux-devel@lists.sourceforge.net,
        LKML <linux-kernel@vger.kernel.org>
References: <1310056562.3528.49.camel@vivanov> <201107071927.16237.richard@nod.at> <CAGTPOqfe8JxMsOru=pydy6ofEi0Ax-N=W_2UZwq5y=grrTemhQ@mail.gmail.com>
In-Reply-To: <CAGTPOqfe8JxMsOru=pydy6ofEi0Ax-N=W_2UZwq5y=grrTemhQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201107081244.53433.richard@nod.at>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Am Freitag 08 Juli 2011, 12:30:56 schrieb Vitaliy Ivanov:
> On Thu, Jul 7, 2011 at 8:27 PM, Richard Weinberger <richard@nod.at> wrote:
> > 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.
> 
> I just didn't want to clone this free-return stuff. So, what you
> proposing is like this:
> ------------
> ...
>         output = uml_kmalloc(output_len, UM_GFP_KERNEL);
>         if (output == NULL)
>                 printk(UM_KERN_ERR "change : failed to allocate output "
>                        "buffer\n");
> 
>         pid = change_tramp(argv, output, output_len);
>         if (pid < 0) {
>                 free(output);               <---------- I'm not sure
> but 'output' can be NULL here.
>                 return;
>         }
> 
>         if (output != NULL) {
>                 printk("%s", output);
>                 kfree(output);
>         }
> }
> ------------
> 
> I was trying to print 'output' only in case change_tramp is
> successful. That's the old logic. And at the same time perform free
> only in case output is not NULL.

Why?
Freeing a NULL pointer is perfectly fine.

Thanks,
//richard