* linux-next: build failure after merge of the final tree (security tree related)
@ 2012-04-16 5:46 Stephen Rothwell
2012-04-16 15:32 ` Will Drewry
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2012-04-16 5:46 UTC (permalink / raw)
To: James Morris
Cc: linux-next, linux-kernel, Will Drewry, H. Peter Anvin, Eric Paris,
Kees Cook
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:
arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
cc1: all warnings being treated as errors
Introduced by commit acf3b2c71ed2 ("seccomp: add SECCOMP_RET_ERRNO"). I
have applied the following hack fix that fixes the build, but the other
seven call sites of secure_computing() should be fixed up properly.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Apr 2012 15:39:49 +1000
Subject: [PATCH] seccomp: hack fix for build failures with secure_computing
return value change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/microblaze/kernel/ptrace.c | 2 +-
arch/mips/kernel/ptrace.c | 2 +-
arch/powerpc/kernel/ptrace.c | 2 +-
arch/s390/kernel/ptrace.c | 2 +-
arch/sh/kernel/ptrace_32.c | 2 +-
arch/sh/kernel/ptrace_64.c | 2 +-
arch/sparc/kernel/ptrace_64.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
index 6eb2aa9..9e3ffc9 100644
--- a/arch/microblaze/kernel/ptrace.c
+++ b/arch/microblaze/kernel/ptrace.c
@@ -136,7 +136,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
- secure_computing(regs->r12);
+ (void)secure_computing(regs->r12);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 7c24c29..4f83d73 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -535,7 +535,7 @@ static inline int audit_arch(void)
asmlinkage void syscall_trace_enter(struct pt_regs *regs)
{
/* do the secure computing check first */
- secure_computing(regs->regs[2]);
+ (void)secure_computing(regs->regs[2]);
if (!(current->ptrace & PT_PTRACED))
goto out;
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 8d8e028..53cebc4 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -1710,7 +1710,7 @@ long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
- secure_computing(regs->gpr[0]);
+ (void)secure_computing(regs->gpr[0]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 02f300f..96e0dea 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -719,7 +719,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
long ret = 0;
/* Do the secure computing check first. */
- secure_computing(regs->gprs[2]);
+ (void)secure_computing(regs->gprs[2]);
/*
* The sysc_tracesys code in entry.S stored the system
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 9698671..cf55945 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
- secure_computing(regs->regs[0]);
+ (void)secure_computing(regs->regs[0]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index bc81e07..3d3600f 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -522,7 +522,7 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
{
long long ret = 0;
- secure_computing(regs->regs[9]);
+ (void)secure_computing(regs->regs[9]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index 6f97c07..6ddec1f 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -1062,7 +1062,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
int ret = 0;
/* do the secure computing check first */
- secure_computing(regs->u_regs[UREG_G1]);
+ (void)secure_computing(regs->u_regs[UREG_G1]);
if (test_thread_flag(TIF_SYSCALL_TRACE))
ret = tracehook_report_syscall_entry(regs);
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the final tree (security tree related)
2012-04-16 5:46 linux-next: build failure after merge of the final tree (security tree related) Stephen Rothwell
@ 2012-04-16 15:32 ` Will Drewry
2012-04-16 15:34 ` Eric Paris
2012-04-16 16:15 ` Will Drewry
0 siblings, 2 replies; 12+ messages in thread
From: Will Drewry @ 2012-04-16 15:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: James Morris, linux-next, linux-kernel, H. Peter Anvin,
Eric Paris, Kees Cook
On Mon, Apr 16, 2012 at 12:46 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
> arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
> cc1: all warnings being treated as errors
>
> Introduced by commit acf3b2c71ed2 ("seccomp: add SECCOMP_RET_ERRNO"). I
> have applied the following hack fix that fixes the build, but the other
> seven call sites of secure_computing() should be fixed up properly.
Thanks for this, and the other two fixes! I'll pull together a patch
fixing up the other call sites. My past revisions had avoided this by
using a new symbol, and I totally forgot to touch these up in the last
round.
What's the best way to submit the clean up -- against the security-next tree?
Thanks and sorry for the noise!
will
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 16 Apr 2012 15:39:49 +1000
> Subject: [PATCH] seccomp: hack fix for build failures with secure_computing
> return value change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/microblaze/kernel/ptrace.c | 2 +-
> arch/mips/kernel/ptrace.c | 2 +-
> arch/powerpc/kernel/ptrace.c | 2 +-
> arch/s390/kernel/ptrace.c | 2 +-
> arch/sh/kernel/ptrace_32.c | 2 +-
> arch/sh/kernel/ptrace_64.c | 2 +-
> arch/sparc/kernel/ptrace_64.c | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
> index 6eb2aa9..9e3ffc9 100644
> --- a/arch/microblaze/kernel/ptrace.c
> +++ b/arch/microblaze/kernel/ptrace.c
> @@ -136,7 +136,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - secure_computing(regs->r12);
> + (void)secure_computing(regs->r12);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
> index 7c24c29..4f83d73 100644
> --- a/arch/mips/kernel/ptrace.c
> +++ b/arch/mips/kernel/ptrace.c
> @@ -535,7 +535,7 @@ static inline int audit_arch(void)
> asmlinkage void syscall_trace_enter(struct pt_regs *regs)
> {
> /* do the secure computing check first */
> - secure_computing(regs->regs[2]);
> + (void)secure_computing(regs->regs[2]);
>
> if (!(current->ptrace & PT_PTRACED))
> goto out;
> diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
> index 8d8e028..53cebc4 100644
> --- a/arch/powerpc/kernel/ptrace.c
> +++ b/arch/powerpc/kernel/ptrace.c
> @@ -1710,7 +1710,7 @@ long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - secure_computing(regs->gpr[0]);
> + (void)secure_computing(regs->gpr[0]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
> index 02f300f..96e0dea 100644
> --- a/arch/s390/kernel/ptrace.c
> +++ b/arch/s390/kernel/ptrace.c
> @@ -719,7 +719,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
> long ret = 0;
>
> /* Do the secure computing check first. */
> - secure_computing(regs->gprs[2]);
> + (void)secure_computing(regs->gprs[2]);
>
> /*
> * The sysc_tracesys code in entry.S stored the system
> diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
> index 9698671..cf55945 100644
> --- a/arch/sh/kernel/ptrace_32.c
> +++ b/arch/sh/kernel/ptrace_32.c
> @@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - secure_computing(regs->regs[0]);
> + (void)secure_computing(regs->regs[0]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
> index bc81e07..3d3600f 100644
> --- a/arch/sh/kernel/ptrace_64.c
> +++ b/arch/sh/kernel/ptrace_64.c
> @@ -522,7 +522,7 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long long ret = 0;
>
> - secure_computing(regs->regs[9]);
> + (void)secure_computing(regs->regs[9]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
> index 6f97c07..6ddec1f 100644
> --- a/arch/sparc/kernel/ptrace_64.c
> +++ b/arch/sparc/kernel/ptrace_64.c
> @@ -1062,7 +1062,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
> int ret = 0;
>
> /* do the secure computing check first */
> - secure_computing(regs->u_regs[UREG_G1]);
> + (void)secure_computing(regs->u_regs[UREG_G1]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE))
> ret = tracehook_report_syscall_entry(regs);
> --
> 1.7.10.rc3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the final tree (security tree related)
2012-04-16 15:32 ` Will Drewry
@ 2012-04-16 15:34 ` Eric Paris
2012-04-16 15:44 ` Will Drewry
2012-04-16 16:15 ` Will Drewry
1 sibling, 1 reply; 12+ messages in thread
From: Eric Paris @ 2012-04-16 15:34 UTC (permalink / raw)
To: Will Drewry
Cc: Stephen Rothwell, James Morris, linux-next, linux-kernel,
H. Peter Anvin, Kees Cook
On Mon, 2012-04-16 at 10:32 -0500, Will Drewry wrote:
> Thanks for this, and the other two fixes! I'll pull together a patch
> fixing up the other call sites. My past revisions had avoided this by
> using a new symbol, and I totally forgot to touch these up in the last
> round.
>
> What's the best way to submit the clean up -- against the security-next tree?
>
> Thanks and sorry for the noise!
Just send fixes to James and they will get picked up by Stephen the day
after he commits them to security-next.
-Eric
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the final tree (security tree related)
2012-04-16 15:34 ` Eric Paris
@ 2012-04-16 15:44 ` Will Drewry
0 siblings, 0 replies; 12+ messages in thread
From: Will Drewry @ 2012-04-16 15:44 UTC (permalink / raw)
To: Eric Paris
Cc: Stephen Rothwell, James Morris, linux-next, linux-kernel,
H. Peter Anvin, Kees Cook
On Mon, Apr 16, 2012 at 10:34 AM, Eric Paris <eparis@redhat.com> wrote:
> On Mon, 2012-04-16 at 10:32 -0500, Will Drewry wrote:
>
>> Thanks for this, and the other two fixes! I'll pull together a patch
>> fixing up the other call sites. My past revisions had avoided this by
>> using a new symbol, and I totally forgot to touch these up in the last
>> round.
>>
>> What's the best way to submit the clean up -- against the security-next tree?
>>
>> Thanks and sorry for the noise!
>
> Just send fixes to James and they will get picked up by Stephen the day
> after he commits them to security-next.
Cool - thanks!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the final tree (security tree related)
2012-04-16 15:32 ` Will Drewry
2012-04-16 15:34 ` Eric Paris
@ 2012-04-16 16:15 ` Will Drewry
2012-04-17 1:33 ` James Morris
1 sibling, 1 reply; 12+ messages in thread
From: Will Drewry @ 2012-04-16 16:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: James Morris, linux-next, linux-kernel, H. Peter Anvin,
Eric Paris, Kees Cook
On Mon, Apr 16, 2012 at 10:32 AM, Will Drewry <wad@chromium.org> wrote:
> On Mon, Apr 16, 2012 at 12:46 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Hi all,
>>
>> After merging the final tree, today's linux-next build (powerpc
>> allnoconfig) failed like this:
>>
>> arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
>> arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
>> cc1: all warnings being treated as errors
>>
>> Introduced by commit acf3b2c71ed2 ("seccomp: add SECCOMP_RET_ERRNO"). I
>> have applied the following hack fix that fixes the build, but the other
>> seven call sites of secure_computing() should be fixed up properly.
>
> Thanks for this, and the other two fixes! I'll pull together a patch
> fixing up the other call sites.
Hrm - with liberal application of grep and lxr, I'm not seeing any
other call sites that need to be fixed. I ended up with the exact
same patch as yours.
At present, the return value from secure_computing() can be ignored
for every arch that supports CONFIG_SECCOMP and does not support
CONFIG_HAVE_ARCH_SECCOMP_FILTER, so I don't necessarily see your patch
as a hack. Then as the pieces needed to support
CONFIG_HAVE_ARCH_SECCOMP_FILTER end up in place, the (void) cast will
be removed. (Respecting the return value is noted in the arch/Kconfig
description for adding support.)
I certainly don't mind bouncing the casts patch (broken out per-arch)
over to James's tree so that you don't have to carry the fix, but I
wonder if I'm missing some implicit context.
Thanks!
will
>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 16 Apr 2012 15:39:49 +1000
>> Subject: [PATCH] seccomp: hack fix for build failures with secure_computing
>> return value change
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> arch/microblaze/kernel/ptrace.c | 2 +-
>> arch/mips/kernel/ptrace.c | 2 +-
>> arch/powerpc/kernel/ptrace.c | 2 +-
>> arch/s390/kernel/ptrace.c | 2 +-
>> arch/sh/kernel/ptrace_32.c | 2 +-
>> arch/sh/kernel/ptrace_64.c | 2 +-
>> arch/sparc/kernel/ptrace_64.c | 2 +-
>> 7 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
>> index 6eb2aa9..9e3ffc9 100644
>> --- a/arch/microblaze/kernel/ptrace.c
>> +++ b/arch/microblaze/kernel/ptrace.c
>> @@ -136,7 +136,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
>> {
>> long ret = 0;
>>
>> - secure_computing(regs->r12);
>> + (void)secure_computing(regs->r12);
>>
>> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
>> tracehook_report_syscall_entry(regs))
>> diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
>> index 7c24c29..4f83d73 100644
>> --- a/arch/mips/kernel/ptrace.c
>> +++ b/arch/mips/kernel/ptrace.c
>> @@ -535,7 +535,7 @@ static inline int audit_arch(void)
>> asmlinkage void syscall_trace_enter(struct pt_regs *regs)
>> {
>> /* do the secure computing check first */
>> - secure_computing(regs->regs[2]);
>> + (void)secure_computing(regs->regs[2]);
>>
>> if (!(current->ptrace & PT_PTRACED))
>> goto out;
>> diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
>> index 8d8e028..53cebc4 100644
>> --- a/arch/powerpc/kernel/ptrace.c
>> +++ b/arch/powerpc/kernel/ptrace.c
>> @@ -1710,7 +1710,7 @@ long do_syscall_trace_enter(struct pt_regs *regs)
>> {
>> long ret = 0;
>>
>> - secure_computing(regs->gpr[0]);
>> + (void)secure_computing(regs->gpr[0]);
>>
>> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
>> tracehook_report_syscall_entry(regs))
>> diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
>> index 02f300f..96e0dea 100644
>> --- a/arch/s390/kernel/ptrace.c
>> +++ b/arch/s390/kernel/ptrace.c
>> @@ -719,7 +719,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
>> long ret = 0;
>>
>> /* Do the secure computing check first. */
>> - secure_computing(regs->gprs[2]);
>> + (void)secure_computing(regs->gprs[2]);
>>
>> /*
>> * The sysc_tracesys code in entry.S stored the system
>> diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
>> index 9698671..cf55945 100644
>> --- a/arch/sh/kernel/ptrace_32.c
>> +++ b/arch/sh/kernel/ptrace_32.c
>> @@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
>> {
>> long ret = 0;
>>
>> - secure_computing(regs->regs[0]);
>> + (void)secure_computing(regs->regs[0]);
>>
>> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
>> tracehook_report_syscall_entry(regs))
>> diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
>> index bc81e07..3d3600f 100644
>> --- a/arch/sh/kernel/ptrace_64.c
>> +++ b/arch/sh/kernel/ptrace_64.c
>> @@ -522,7 +522,7 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
>> {
>> long long ret = 0;
>>
>> - secure_computing(regs->regs[9]);
>> + (void)secure_computing(regs->regs[9]);
>>
>> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
>> tracehook_report_syscall_entry(regs))
>> diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
>> index 6f97c07..6ddec1f 100644
>> --- a/arch/sparc/kernel/ptrace_64.c
>> +++ b/arch/sparc/kernel/ptrace_64.c
>> @@ -1062,7 +1062,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
>> int ret = 0;
>>
>> /* do the secure computing check first */
>> - secure_computing(regs->u_regs[UREG_G1]);
>> + (void)secure_computing(regs->u_regs[UREG_G1]);
>>
>> if (test_thread_flag(TIF_SYSCALL_TRACE))
>> ret = tracehook_report_syscall_entry(regs);
>> --
>> 1.7.10.rc3
>>
>> --
>> Cheers,
>> Stephen Rothwell sfr@canb.auug.org.au
>> http://www.canb.auug.org.au/~sfr/
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the final tree (security tree related)
2012-04-16 16:15 ` Will Drewry
@ 2012-04-17 1:33 ` James Morris
2012-04-17 2:02 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: James Morris @ 2012-04-17 1:33 UTC (permalink / raw)
To: Will Drewry
Cc: Stephen Rothwell, linux-next, linux-kernel, H. Peter Anvin,
Eric Paris, Kees Cook
On Mon, 16 Apr 2012, Will Drewry wrote:
> >> arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
> >> arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
> >> cc1: all warnings being treated as errors
Is this happening because of
#define secure_computing(x) 0
?
In any case, that should probably be a static inline.
- James
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: build failure after merge of the final tree (security tree related)
2012-04-17 1:33 ` James Morris
@ 2012-04-17 2:02 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2012-04-17 2:02 UTC (permalink / raw)
To: James Morris
Cc: Will Drewry, linux-next, linux-kernel, H. Peter Anvin, Eric Paris,
Kees Cook
[-- Attachment #1: Type: text/plain, Size: 860 bytes --]
Hi James,
On Tue, 17 Apr 2012 11:33:26 +1000 (EST) James Morris <jmorris@namei.org> wrote:
>
> On Mon, 16 Apr 2012, Will Drewry wrote:
>
> > >> arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
> > >> arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
> > >> cc1: all warnings being treated as errors
>
> Is this happening because of
>
> #define secure_computing(x) 0
>
> ?
>
> In any case, that should probably be a static inline.
That could well be so - sorry I missed that. The failure was in an
allnoconfig build, so CONFIG_SECCOMP was off.
And yes, changing that to:
static inline int secure_computing(int this_syscall) { return 0; }
fixes the build problem. So that is a better fix.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: build failure after merge of the final tree (security tree related)
@ 2011-10-14 7:07 Stephen Rothwell
2011-10-14 7:25 ` Sakkinen, Jarkko
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2011-10-14 7:07 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, linux-kernel, Jarkko Sakkinen
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
Hi James,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
security/smack/smack_lsm.c: In function 'smack_bprm_set_creds':
security/smack/smack_lsm.c:473:21: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
Caused by commit 84088ba23929 ("Smack: domain transition protections
(v3)"). PER_CLEAR_ON_SETID is defined in linux/personality.h which is not
directly included by the above file.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the final tree (security tree related)
2011-10-14 7:07 Stephen Rothwell
@ 2011-10-14 7:25 ` Sakkinen, Jarkko
0 siblings, 0 replies; 12+ messages in thread
From: Sakkinen, Jarkko @ 2011-10-14 7:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James Morris, linux-next, linux-kernel, Casey Schaufler
On Fri, Oct 14, 2011 at 10:07 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi James,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> security/smack/smack_lsm.c: In function 'smack_bprm_set_creds':
> security/smack/smack_lsm.c:473:21: error: 'PER_CLEAR_ON_SETID' undeclared (first use in this function)
>
> Caused by commit 84088ba23929 ("Smack: domain transition protections
> (v3)"). PER_CLEAR_ON_SETID is defined in linux/personality.h which is not
> directly included by the above file.
>
> I have reverted that commit for today.
Oops. Sorry about that. Thanks for informing, I'll fix the issue ASAP.
/Jarkko
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: build failure after merge of the final tree (security tree related)
@ 2011-09-15 7:07 Stephen Rothwell
2011-09-15 22:03 ` Mimi Zohar
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2011-09-15 7:07 UTC (permalink / raw)
To: James Morris; +Cc: linux-next, linux-kernel, Mimi Zohar
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
security/keys/encrypted-keys/masterkey_trusted.c: In function 'request_trusted_key':
security/keys/encrypted-keys/masterkey_trusted.c:35:2: error: implicit declaration of function 'IS_ERR'
Caused by commit 982e617a313b ("encrypted-keys: remove trusted-keys
dependency"). Forgot to include linux/err.h. See Rule 1 in
Documentation/SubmitChecklist.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 Sep 2011 17:03:09 +1000
Subject: [PATCH] encrypted-keys: IS_ERR need include/err.h
Fixes this build error:
security/keys/encrypted-keys/masterkey_trusted.c: In function 'request_trusted_key':
security/keys/encrypted-keys/masterkey_trusted.c:35:2: error: implicit declaration of function 'IS_ERR'
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
security/keys/encrypted-keys/masterkey_trusted.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/security/keys/encrypted-keys/masterkey_trusted.c b/security/keys/encrypted-keys/masterkey_trusted.c
index a5da512..df87272 100644
--- a/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/security/keys/encrypted-keys/masterkey_trusted.c
@@ -16,6 +16,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
+#include <linux/err.h>
#include <keys/trusted-type.h>
/*
--
1.7.5.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the final tree (security tree related)
2011-09-15 7:07 Stephen Rothwell
@ 2011-09-15 22:03 ` Mimi Zohar
2011-09-16 0:51 ` James Morris
0 siblings, 1 reply; 12+ messages in thread
From: Mimi Zohar @ 2011-09-15 22:03 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: James Morris, linux-next, linux-kernel
On Thu, 2011-09-15 at 17:07 +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> security/keys/encrypted-keys/masterkey_trusted.c: In function 'request_trusted_key':
> security/keys/encrypted-keys/masterkey_trusted.c:35:2: error: implicit declaration of function 'IS_ERR'
>
> Caused by commit 982e617a313b ("encrypted-keys: remove trusted-keys
> dependency"). Forgot to include linux/err.h. See Rule 1 in
> Documentation/SubmitChecklist.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 15 Sep 2011 17:03:09 +1000
> Subject: [PATCH] encrypted-keys: IS_ERR need include/err.h
>
> Fixes this build error:
>
> security/keys/encrypted-keys/masterkey_trusted.c: In function 'request_trusted_key':
> security/keys/encrypted-keys/masterkey_trusted.c:35:2: error: implicit declaration of function 'IS_ERR'
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> security/keys/encrypted-keys/masterkey_trusted.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/security/keys/encrypted-keys/masterkey_trusted.c b/security/keys/encrypted-keys/masterkey_trusted.c
> index a5da512..df87272 100644
> --- a/security/keys/encrypted-keys/masterkey_trusted.c
> +++ b/security/keys/encrypted-keys/masterkey_trusted.c
> @@ -16,6 +16,7 @@
>
> #include <linux/uaccess.h>
> #include <linux/module.h>
> +#include <linux/err.h>
> #include <keys/trusted-type.h>
>
> /*
> --
> 1.7.5.4
Thanks Stephen. James, assuming that the patch needs to be made
available from the security tree, it's available from:
The following changes since commit 8de6ac7f58a22fdab399fbe97763e465ea49c735:
Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next (2011-09-15 09:53:38 +1000)
are available in the git repository at:
git://github.com/mzohar/linux-evm.git next-for-james
Stephen Rothwell (1):
encrypted-keys: IS_ERR need include/err.h
security/keys/encrypted-keys/masterkey_trusted.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
thanks,
Mimi
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: build failure after merge of the final tree (security tree related)
2011-09-15 22:03 ` Mimi Zohar
@ 2011-09-16 0:51 ` James Morris
0 siblings, 0 replies; 12+ messages in thread
From: James Morris @ 2011-09-16 0:51 UTC (permalink / raw)
To: Mimi Zohar; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Thu, 15 Sep 2011, Mimi Zohar wrote:
> Thanks Stephen. James, assuming that the patch needs to be made
> available from the security tree, it's available from:
>
> The following changes since commit 8de6ac7f58a22fdab399fbe97763e465ea49c735:
>
> Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next (2011-09-15 09:53:38 +1000)
>
> are available in the git repository at:
>
> git://github.com/mzohar/linux-evm.git next-for-james
>
> Stephen Rothwell (1):
> encrypted-keys: IS_ERR need include/err.h
>
> security/keys/encrypted-keys/masterkey_trusted.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
Pulled, thanks.
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-04-17 2:02 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-16 5:46 linux-next: build failure after merge of the final tree (security tree related) Stephen Rothwell
2012-04-16 15:32 ` Will Drewry
2012-04-16 15:34 ` Eric Paris
2012-04-16 15:44 ` Will Drewry
2012-04-16 16:15 ` Will Drewry
2012-04-17 1:33 ` James Morris
2012-04-17 2:02 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2011-10-14 7:07 Stephen Rothwell
2011-10-14 7:25 ` Sakkinen, Jarkko
2011-09-15 7:07 Stephen Rothwell
2011-09-15 22:03 ` Mimi Zohar
2011-09-16 0:51 ` James Morris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox