[PATCH] modpost: fix asprintf warnings

[PATCH] modpost: fix asprintf warnings

[Mike Frysinger]

On compilers with security warnings enabled by default, we get:

scripts/mod/modpost.c: In function 'get_markers':
scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
                                     declared with attribute warn_unused_result
scripts/mod/modpost.c: In function 'add_marker':
scripts/mod/modpost.c:1982: warning: ignoring return value of 'asprintf',
                                     declared with attribute warn_unused_result

So check the return value and abort on errors.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 scripts/mod/modpost.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 801a16a..c4df538 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1559,7 +1559,8 @@ static void get_markers(struct elf_info *info, struct module *mod)
 			const char *name = strings + sym->st_value;
 			const char *fmt = strchr(name, '\0') + 1;
 			char *line = NULL;
-			asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
+			if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
+				fatal("asprintf() with %s failed", name);
 			NOFAIL(line);
 			mod->markers[n++] = line;
 		}
@@ -1979,7 +1980,8 @@ static void write_dump(const char *fname)
 static void add_marker(struct module *mod, const char *name, const char *fmt)
 {
 	char *line = NULL;
-	asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
+	if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
+		fatal("asprintf() with %s failed", name);
 	NOFAIL(line);
 
 	mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *
-- 
1.6.5.5

Re: [PATCH] modpost: fix asprintf warnings

[Américo Wang]

On Wed, Dec 09, 2009 at 07:02:23AM -0500, Mike Frysinger wrote:
>On compilers with security warnings enabled by default, we get:
>
>scripts/mod/modpost.c: In function 'get_markers':
>scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
>                                     declared with attribute warn_unused_result
>scripts/mod/modpost.c: In function 'add_marker':
>scripts/mod/modpost.c:1982: warning: ignoring return value of 'asprintf',
>                                     declared with attribute warn_unused_result
>
>So check the return value and abort on errors.
>
>Signed-off-by: Mike Frysinger <vapier@gentoo.org>
>---
> scripts/mod/modpost.c |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
>index 801a16a..c4df538 100644
>--- a/scripts/mod/modpost.c
>+++ b/scripts/mod/modpost.c
>@@ -1559,7 +1559,8 @@ static void get_markers(struct elf_info *info, struct module *mod)
> 			const char *name = strings + sym->st_value;
> 			const char *fmt = strchr(name, '\0') + 1;
> 			char *line = NULL;
>-			asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
>+			if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
>+				fatal("asprintf() with %s failed", name);

A '\n' is needed.

> 			NOFAIL(line);
> 			mod->markers[n++] = line;
> 		}
>@@ -1979,7 +1980,8 @@ static void write_dump(const char *fname)
> static void add_marker(struct module *mod, const char *name, const char *fmt)
> {
> 	char *line = NULL;
>-	asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
>+	if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
>+		fatal("asprintf() with %s failed", name);
> 	NOFAIL(line);
> 
> 	mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *
>-- 
>1.6.5.5
>
>--
>To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html
>Please read the FAQ at  http://www.tux.org/lkml/

-- 
Live like a child, think like the god.
 

Re: [PATCH] modpost: fix asprintf warnings

[Mike Frysinger]

On Wed, Dec 9, 2009 at 10:59, Américo Wang wrote:
> On Wed, Dec 09, 2009 at 07:02:23AM -0500, Mike Frysinger wrote:
>>--- a/scripts/mod/modpost.c
>>+++ b/scripts/mod/modpost.c
>>@@ -1559,7 +1559,8 @@ static void get_markers(struct elf_info *info, struct module *mod)
>>                       const char *name = strings + sym->st_value;
>>                       const char *fmt = strchr(name, '\0') + 1;
>>                       char *line = NULL;
>>-                      asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
>>+                      if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
>>+                              fatal("asprintf() with %s failed", name);
>
> A '\n' is needed.

hmm, i thought fatal() appended a new line automatically.  must have
been thinking of one of the other utils.
-mike

[PATCH v2] modpost: fix asprintf warnings

[Mike Frysinger]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1738 bytes --]

On compilers with security warnings enabled by default, we get:

scripts/mod/modpost.c: In function 'get_markers':
scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
                                     declared with attribute warn_unused_result
scripts/mod/modpost.c: In function 'add_marker':
scripts/mod/modpost.c:1982: warning: ignoring return value of 'asprintf',
                                     declared with attribute warn_unused_result

So check the return value and abort on errors.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
v2
	- add missing newline pointed out by Américo Wang

 scripts/mod/modpost.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 801a16a..6608ebd 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1559,7 +1559,8 @@ static void get_markers(struct elf_info *info, struct module *mod)
 			const char *name = strings + sym->st_value;
 			const char *fmt = strchr(name, '\0') + 1;
 			char *line = NULL;
-			asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
+			if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
+				fatal("asprintf() with %s failed\n", name);
 			NOFAIL(line);
 			mod->markers[n++] = line;
 		}
@@ -1979,7 +1980,8 @@ static void write_dump(const char *fname)
 static void add_marker(struct module *mod, const char *name, const char *fmt)
 {
 	char *line = NULL;
-	asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
+	if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
+		fatal("asprintf() with %s failed\n", name);
 	NOFAIL(line);
 
 	mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *
-- 
1.6.5.5

Re: [PATCH v2] modpost: fix asprintf warnings

[Américo Wang]

On Thu, Dec 10, 2009 at 9:16 AM, Mike Frysinger <vapier@gentoo.org> wrote:
> On compilers with security warnings enabled by default, we get:
>
> scripts/mod/modpost.c: In function 'get_markers':
> scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
>                                     declared with attribute warn_unused_result
> scripts/mod/modpost.c: In function 'add_marker':
> scripts/mod/modpost.c:1982: warning: ignoring return value of 'asprintf',
>                                     declared with attribute warn_unused_result
>
> So check the return value and abort on errors.
>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>


Acked-by: WANG Cong <xiyou.wangcong@gmail.com>

> ---
> v2
>        - add missing newline pointed out by Américo Wang
>
>  scripts/mod/modpost.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 801a16a..6608ebd 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -1559,7 +1559,8 @@ static void get_markers(struct elf_info *info, struct module *mod)
>                        const char *name = strings + sym->st_value;
>                        const char *fmt = strchr(name, '\0') + 1;
>                        char *line = NULL;
> -                       asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
> +                       if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
> +                               fatal("asprintf() with %s failed\n", name);
>                        NOFAIL(line);
>                        mod->markers[n++] = line;
>                }
> @@ -1979,7 +1980,8 @@ static void write_dump(const char *fname)
>  static void add_marker(struct module *mod, const char *name, const char *fmt)
>  {
>        char *line = NULL;
> -       asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
> +       if (asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt) == -1)
> +               fatal("asprintf() with %s failed\n", name);
>        NOFAIL(line);
>
>        mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *

Re: [PATCH v2] modpost: fix asprintf warnings

[Rusty Russell]

On Thu, 10 Dec 2009 11:46:19 am Mike Frysinger wrote:
> On compilers with security warnings enabled by default, we get:
> 
> scripts/mod/modpost.c: In function 'get_markers':
> scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
>                                      declared with attribute warn_unused_result
> scripts/mod/modpost.c: In function 'add_marker':
> scripts/mod/modpost.c:1982: warning: ignoring return value of 'asprintf',
>                                      declared with attribute warn_unused_result

Actually I think these warnings only occur with -DFORTIFY_SOURCE.  This is
turned on by Ubuntu at least.

I think they're a bad idea (if you really don't care, suppressing them is
really painful), but that's a separate battle...

Applied,
Rusty.

Re: [PATCH v2] modpost: fix asprintf warnings

[Rusty Russell]

On Thu, 10 Dec 2009 09:37:52 pm Rusty Russell wrote:
> On Thu, 10 Dec 2009 11:46:19 am Mike Frysinger wrote:
> > On compilers with security warnings enabled by default, we get:
> > 
> > scripts/mod/modpost.c: In function 'get_markers':
> > scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
...
> Applied,
> Rusty.

Actually, not applied since another patch in my queue deletes that obsolete
code altogether.

Thanks,
Rusty.

Re: [PATCH v2] modpost: fix asprintf warnings

[Mike Frysinger]

On Thu, Dec 10, 2009 at 06:52, Rusty Russell wrote:
> On Thu, 10 Dec 2009 09:37:52 pm Rusty Russell wrote:
>> On Thu, 10 Dec 2009 11:46:19 am Mike Frysinger wrote:
>> > On compilers with security warnings enabled by default, we get:
>> >
>> > scripts/mod/modpost.c: In function 'get_markers':
>> > scripts/mod/modpost.c:1562: warning: ignoring return value of 'asprintf',
> ...
>> Applied,
>> Rusty.
>
> Actually, not applied since another patch in my queue deletes that obsolete
> code altogether.

WFM.  hopefully new code doesnt trigger warnings too, but i guess i'll
post another patch if it does ;).
-mike