2019-10-15 07:15:10

by Denis Efremov (Oracle)

Subject: [PATCH] modpost: add NOFAIL to strdup call

Add NOFAIL check for the strdup call, since the function
allocates memory and can return NULL. All strdup calls in
modpost are checked with NOFAIL.

Signed-off-by: Denis Efremov <[email protected]>
---
scripts/mod/modpost.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 936d3ad23c83..8e8975065cbc 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -384,7 +384,7 @@ static struct symbol *sym_add_exported(const char *name, const char *namespace,
}
}
free(s->namespace);
- s->namespace = namespace ? strdup(namespace) : NULL;
+ s->namespace = namespace ? NOFAIL(strdup(namespace)) : NULL;
s->preloaded = 0;
s->vmlinux = is_vmlinux(mod->name);
s->kernel = 0;
--
2.21.0

2019-10-18 05:20:46

by Masahiro Yamada

Subject: Re: [PATCH] modpost: add NOFAIL to strdup call

On Tue, Oct 15, 2019 at 3:49 PM Denis Efremov <[email protected]> wrote:
>
> Add NOFAIL check for the strdup call, since the function
> allocates memory and can return NULL. All strdup calls in
> modpost are checked with NOFAIL.
>
> Signed-off-by: Denis Efremov <[email protected]>
> ---
> scripts/mod/modpost.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> index 936d3ad23c83..8e8975065cbc 100644
> --- a/scripts/mod/modpost.c
> +++ b/scripts/mod/modpost.c
> @@ -384,7 +384,7 @@ static struct symbol *sym_add_exported(const char *name, const char *namespace,
> }
> }
> free(s->namespace);
> - s->namespace = namespace ? strdup(namespace) : NULL;
> + s->namespace = namespace ? NOFAIL(strdup(namespace)) : NULL;

This is correct, but I will put it off
because otherwise if would cause a conflict against this patch:

https://lore.kernel.org/patchwork/patch/1138151/

That patch is adding NOFAIL().




> s->preloaded = 0;
> s->vmlinux = is_vmlinux(mod->name);
> s->kernel = 0;
> --
> 2.21.0
>


--
Best Regards
Masahiro Yamada