2017-06-29 01:32:42

by Luis Chamberlain

Subject: [PATCH] module: make the modinfo name const

This can be accomplished by makine blacklisted() also accept const.

Signed-off-by: Luis R. Rodriguez <[email protected]>
---
kernel/module.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index 5ebe3ae2519a..7d679f3bb892 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -302,7 +302,7 @@ int unregister_module_notifier(struct notifier_block *nb)
EXPORT_SYMBOL(unregister_module_notifier);

struct load_info {
- char *name;
+ const char *name;
Elf_Ehdr *hdr;
unsigned long len;
Elf_Shdr *sechdrs;
@@ -3382,7 +3382,7 @@ int __weak module_frob_arch_sections(Elf_Ehdr *hdr,

/* module_blacklist is a comma-separated list of module names */
static char *module_blacklist;
-static bool blacklisted(char *module_name)
+static bool blacklisted(const char *module_name)
{
const char *p;
size_t len;
--
2.10.2

2017-06-29 01:34:31

by Kees Cook

Subject: Re: [PATCH] module: make the modinfo name const

On Wed, Jun 28, 2017 at 6:32 PM, Luis R. Rodriguez <[email protected]> wrote:
> This can be accomplished by makine blacklisted() also accept const.

Typo "making"

> Signed-off-by: Luis R. Rodriguez <[email protected]>

But otherwise:

Acked-by: Kees Cook <[email protected]>

-Kees

> ---
> kernel/module.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/module.c b/kernel/module.c
> index 5ebe3ae2519a..7d679f3bb892 100644
> --- a/kernel/module.c
> +++ b/kernel/module.c
> @@ -302,7 +302,7 @@ int unregister_module_notifier(struct notifier_block *nb)
> EXPORT_SYMBOL(unregister_module_notifier);
>
> struct load_info {
> - char *name;
> + const char *name;
> Elf_Ehdr *hdr;
> unsigned long len;
> Elf_Shdr *sechdrs;
> @@ -3382,7 +3382,7 @@ int __weak module_frob_arch_sections(Elf_Ehdr *hdr,
>
> /* module_blacklist is a comma-separated list of module names */
> static char *module_blacklist;
> -static bool blacklisted(char *module_name)
> +static bool blacklisted(const char *module_name)
> {
> const char *p;
> size_t len;
> --
> 2.10.2
>



--
Kees Cook
Pixel Security

2017-06-29 12:23:21

by Jessica Yu

Subject: Re: [PATCH] module: make the modinfo name const

+++ Luis R. Rodriguez [28/06/17 18:32 -0700]:
>This can be accomplished by makine blacklisted() also accept const.
>
>Signed-off-by: Luis R. Rodriguez <[email protected]>

Applied, thanks!

>---
> kernel/module.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/kernel/module.c b/kernel/module.c
>index 5ebe3ae2519a..7d679f3bb892 100644
>--- a/kernel/module.c
>+++ b/kernel/module.c
>@@ -302,7 +302,7 @@ int unregister_module_notifier(struct notifier_block *nb)
> EXPORT_SYMBOL(unregister_module_notifier);
>
> struct load_info {
>- char *name;
>+ const char *name;
> Elf_Ehdr *hdr;
> unsigned long len;
> Elf_Shdr *sechdrs;
>@@ -3382,7 +3382,7 @@ int __weak module_frob_arch_sections(Elf_Ehdr *hdr,
>
> /* module_blacklist is a comma-separated list of module names */
> static char *module_blacklist;
>-static bool blacklisted(char *module_name)
>+static bool blacklisted(const char *module_name)
> {
> const char *p;
> size_t len;
>--
>2.10.2
>