2017-08-23 13:44:13

by Arnd Bergmann

[permalink] [raw]

Subject: [PATCH] seccomp: add missing semicolon

---

We get a compile error without it, at least in some configurations:

kernel/seccomp.c:1221:1: error: expected ',' or ';' at end of input

Fixes: 8e5f1ad116df ("seccomp: Sysctl to display available actions")
Signed-off-by: Arnd Bergmann <[email protected]>
---
kernel/seccomp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/seccomp.c b/kernel/seccomp.c
index c24579dfa7a1..3eeb2257bd62 100644
--- a/kernel/seccomp.c
+++ b/kernel/seccomp.c
@@ -1218,6 +1218,6 @@ static int __init seccomp_sysctl_init(void)
return 0;
}

-device_initcall(seccomp_sysctl_init)
+device_initcall(seccomp_sysctl_init);

#endif /* CONFIG_SYSCTL */
--
2.9.0

2017-08-23 16:20:44

by Kees Cook

[permalink] [raw]

Subject: Re: [PATCH] seccomp: add missing semicolon

---

On Wed, Aug 23, 2017 at 6:43 AM, Arnd Bergmann <[email protected]> wrote:
> We get a compile error without it, at least in some configurations:
>
> kernel/seccomp.c:1221:1: error: expected ',' or ';' at end of input
>
> Fixes: 8e5f1ad116df ("seccomp: Sysctl to display available actions")
> Signed-off-by: Arnd Bergmann <[email protected]>

Oh, how completely strange. I never saw this in my build testing. If
you have the .config that tripped this, please let me know.

James, can you take this for -next please?

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

Thanks!

-Kees

> ---
> kernel/seccomp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/seccomp.c b/kernel/seccomp.c
> index c24579dfa7a1..3eeb2257bd62 100644
> --- a/kernel/seccomp.c
> +++ b/kernel/seccomp.c
> @@ -1218,6 +1218,6 @@ static int __init seccomp_sysctl_init(void)
> return 0;
> }
>
> -device_initcall(seccomp_sysctl_init)
> +device_initcall(seccomp_sysctl_init);
>
> #endif /* CONFIG_SYSCTL */
> --
> 2.9.0
>



--
Kees Cook
Pixel Security

2017-08-23 16:38:22

by Tyler Hicks

[permalink] [raw]

Subject: Re: [PATCH] seccomp: add missing semicolon

---

On 08/23/2017 11:20 AM, Kees Cook wrote:
> On Wed, Aug 23, 2017 at 6:43 AM, Arnd Bergmann <[email protected]> wrote:
>> We get a compile error without it, at least in some configurations:
>>
>> kernel/seccomp.c:1221:1: error: expected ',' or ';' at end of input
>>
>> Fixes: 8e5f1ad116df ("seccomp: Sysctl to display available actions")
>> Signed-off-by: Arnd Bergmann <[email protected]>
>
> Oh, how completely strange. I never saw this in my build testing. If
> you have the .config that tripped this, please let me know.

Same here...

Thanks for the fix, Arnd!

Tyler

>
> James, can you take this for -next please?
>
> Acked-by: Kees Cook <[email protected]>
>
> Thanks!
>
> -Kees
>
>> ---
>> kernel/seccomp.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/seccomp.c b/kernel/seccomp.c
>> index c24579dfa7a1..3eeb2257bd62 100644
>> --- a/kernel/seccomp.c
>> +++ b/kernel/seccomp.c
>> @@ -1218,6 +1218,6 @@ static int __init seccomp_sysctl_init(void)
>> return 0;
>> }
>>
>> -device_initcall(seccomp_sysctl_init)
>> +device_initcall(seccomp_sysctl_init);
>>
>> #endif /* CONFIG_SYSCTL */
>> --
>> 2.9.0
>>
>
>
>

---

Attachments:

signature.asc (801.00 B)
OpenPGP digital signature