lkml.org 
[lkml]   [2009]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support
On Sun, 13 Dec 2009, Geert Uytterhoeven wrote:

> As of commit ee18d64c1f632043a02e6f5ba5e045bb26a5465f ("KEYS: Add a keyctl to
> install a process's session keyring on its parent [try #6]"), CONFIG_KEYS=y
> fails to build on architectures that haven't implemented TIF_NOTIFY_RESUME yet:
>
> security/keys/keyctl.c: In function 'keyctl_session_to_parent':
> security/keys/keyctl.c:1312: error: 'TIF_NOTIFY_RESUME' undeclared (first use in this function)
> security/keys/keyctl.c:1312: error: (Each undeclared identifier is reported only once
> security/keys/keyctl.c:1312: error: for each function it appears in.)
>
> Make KEYCTL_SESSION_TO_PARENT depend on TIF_NOTIFY_RESUME until blackfin,
> m68k, and xtensa have implemented it.
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: stable@kernel.org

Looks ok to me -- once we have an ack from David, I'll add it to my tree
and push to Linus with another fix.

> ---
> 1. This fixes a regression in 2.6.32.
> 2. Long-time build issues like this make linux-next miss newer build
> problems.
>
> security/keys/keyctl.c | 10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
> index 06ec722..3a9ad87 100644
> --- a/security/keys/keyctl.c
> +++ b/security/keys/keyctl.c
> @@ -1236,6 +1236,7 @@ long keyctl_get_security(key_serial_t keyid,
> */
> long keyctl_session_to_parent(void)
> {
> +#ifdef TIF_NOTIFY_RESUME
> struct task_struct *me, *parent;
> const struct cred *mycred, *pcred;
> struct cred *cred, *oldcred;
> @@ -1326,6 +1327,15 @@ not_permitted:
> error_keyring:
> key_ref_put(keyring_r);
> return ret;
> +
> +#else /* !TIF_NOTIFY_RESUME */
> + /*
> + * To be removed when TIF_NOTIFY_RESUME has been implemented on
> + * blackfin/m68k/xtensa
> + */
> +#warning TIF_NOTIFY_RESUME not implemented
> + return -EOPNOTSUPP;
> +#endif /* !TIF_NOTIFY_RESUME */
> }
>
> /*****************************************************************************/
> --
> 1.6.0.4
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
>

--
James Morris
<jmorris@namei.org>


\
 
 \ /
  Last update: 2009-12-13 22:33    [W:0.084 / U:0.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site