Re: [PATCH 3/4] gcov: add gcov profiling infrastructure

Peter Oberparleiter
2009-06-05T13:07:35Z

Andrew Morton wrote:
> On Wed, 03 Jun 2009 17:26:22 +0200
> Peter Oberparleiter <oberpar@linux.vnet.ibm.com> wrote:
> --- a/kernel/gcov/fs.c~gcov-add-gcov-profiling-infrastructure-update
> +++ a/kernel/gcov/fs.c
> @@ -70,15 +70,8 @@ static int gcov_persist = 1;
>
> static int __init gcov_persist_setup(char *str)
> {
> - int val;
> - char delim;
> -
> - if (sscanf(str, "%d %c", &val, &delim) != 1) {
> - pr_warning("invalid gcov_persist parameter '%s'\n", str);
> - return 0;
> - }
> - pr_info("setting gcov_persist to %d\n", val);
> - gcov_persist = val;
> + gcov_persist = simple_strtoul(str, NULL, 0);
> + pr_info("setting gcov_persist to %d\n", gcov_persist);
>
> return 1;
> }
> _
>
> arguably we should use strict_strtoul(), but the kernel is a lot less
> fussy about boot parameters than it is with sysfs writes, etc. If you
> fat-finger your grub.conf, you lose and we don't tell you.

To improve user-friendliness a bit:

Subject: gcov: use strict_strtoul

From: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>

Use strict_strtoul to identify kernel parameter format errors.

Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
---
kernel/gcov/fs.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

Index: linux-2.6.30-rc8-mm1/kernel/gcov/fs.c
===================================================================
--- linux-2.6.30-rc8-mm1.orig/kernel/gcov/fs.c
+++ linux-2.6.30-rc8-mm1/kernel/gcov/fs.c
@@ -70,7 +70,13 @@ static int gcov_persist = 1;

static int __init gcov_persist_setup(char *str)
{
- gcov_persist = simple_strtoul(str, NULL, 0);
+ unsigned long val;
+
+ if (strict_strtoul(str, 0, &val)) {
+ pr_warning("invalid gcov_persist parameter '%s'\n", str);
+ return 0;
+ }
+ gcov_persist = val;
pr_info("setting gcov_persist to %d\n", gcov_persist);

return 1;