summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2009-04-09 11:19:40 +0800
committerIngo Molnar <mingo@elte.hu>2009-04-09 05:52:40 +0200
commit9eb85125ce218a8b8d9a7c982510388e227adbec (patch)
tree320b87113d2c6b151f14e39d3a7e60174e19b0be
parent47788c58e66c050982241d9a05eb690daceb05a9 (diff)
downloadlinux-3.10-9eb85125ce218a8b8d9a7c982510388e227adbec.tar.gz
linux-3.10-9eb85125ce218a8b8d9a7c982510388e227adbec.tar.bz2
linux-3.10-9eb85125ce218a8b8d9a7c982510388e227adbec.zip
blktrace: pass the right pointer to kfree()
Impact: fix kfree crash with non-standard act_mask string 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@cn.fujitsu.com> Cc: Jens Axboe <jens.axboe@oracle.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <49DD694C.8020902@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/blktrace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index b32ff446c3f..921ef5d1f0b 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;
}