Subject: linux-next: origin tree build failure

From: Stephen Rothwell <[email-masked]>
Date: Mon, 18 Aug 2008 10:01:51 +1000

Hi Linus,

As expected (reported by David Fries), today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/tracehook.h:52,
                 from arch/powerpc/kernel/signal.c:13:
include/linux/security.h: In function 'security_ptrace_traceme':
include/linux/security.h:1760: error: 'parent' undeclared (first use in this function)

Caused by commit 5cd9c58fbe9ec92b45b27e131719af4f2bd9eb40 ("security: Fix
setting of PF_SUPERPRIV by __capable()").  The version of this commit
that has been in the linux-next tree from Aug 8 to Aug 15 is correct, so
I have no idea what happened.

More care needed ...

I applied the following patch from David Fries.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/

Date: Sat, 16 Aug 2008 20:17:11 -0500
From: David Fries <[email-masked]>
To: David Howells <[email-masked]>
Cc: [email-masked], [email-masked], [email-masked],
        [email-masked]
Subject: Fix setting of PF_SUPERPRIV by __capable()

The first two submissions this patch had parent for the argument, the third
one has child then parent and fails to compile with SECURITY disabled.
Please apply the following patch.

> +static inline int security_ptrace_traceme(struct task_struct *child)
>  {
> -	return cap_ptrace(parent, child, mode);
> +	return cap_ptrace_traceme(parent);
>  }

    security_ptrace_traceme error: 'parent' undeclared

    s/child/parent/

    Signed-off-by: David Fries <[email-masked]>

diff --git a/include/linux/security.h b/include/linux/security.h
index 2ee5ecf..80c4d00 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1755,7 +1755,7 @@ static inline int security_ptrace_may_access(struct task_struct *child,
 	return cap_ptrace_may_access(child, mode);
 }
 
-static inline int security_ptrace_traceme(struct task_struct *child)
+static inline int security_ptrace_traceme(struct task_struct *parent)
 {
 	return cap_ptrace_traceme(parent);
 }