[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20090409131310.GC24946@ghostprotocols.net>
Date: Thu, 9 Apr 2009 10:13:10 -0300
From: Arnaldo Carvalho de Melo <acme@...hat.com>
To: Li Zefan <lizf@...fujitsu.com>
Cc: Ingo Molnar <mingo@...e.hu>, Jens Axboe <jens.axboe@...cle.com>,
LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] blktrace: pass the right pointer to kfree()
Em Thu, Apr 09, 2009 at 11:19:40AM +0800, Li Zefan escreveu:
> If passing a string with leading white spaces to strstrip(),
> the returned ptr != the original ptr.
>
> This bug was introduced by me.
>
> Signed-off-by: Li Zefan <lizf@...fujitsu.com>
I hadn't noticed that strstrip was added, oops.
Acked-by: Arnaldo Carvalho de Melo <acme@...hat.com>
> ---
> kernel/trace/blktrace.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index b32ff44..921ef5d 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -1377,12 +1377,12 @@ static int blk_trace_str2mask(const char *str)
> {
> int i;
> int mask = 0;
> - char *s, *token;
> + char *buf, *s, *token;
>
> - s = kstrdup(str, GFP_KERNEL);
> - if (s == NULL)
> + buf = kstrdup(str, GFP_KERNEL);
> + if (buf == NULL)
> return -ENOMEM;
> - s = strstrip(s);
> + s = strstrip(buf);
>
> while (1) {
> token = strsep(&s, ",");
> @@ -1403,7 +1403,7 @@ static int blk_trace_str2mask(const char *str)
> break;
> }
> }
> - kfree(s);
> + kfree(buf);
>
> return mask;
> }
> --
> 1.5.4.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists