Skip to content

Commit

Permalink
Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture s…
Browse files Browse the repository at this point in the history
…upport

As of commit ee18d64 ("KEYS: Add a keyctl to
install a process's session keyring on its parent [try torvalds#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
m68k, and xtensa have implemented it.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
geertu authored and James Morris committed Dec 16, 2009
1 parent 6e14154 commit a00ae4d
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions security/keys/keyctl.c
Expand Up @@ -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;
Expand Down Expand Up @@ -1326,6 +1327,15 @@ long keyctl_session_to_parent(void)
error_keyring:
key_ref_put(keyring_r);
return ret;

#else /* !TIF_NOTIFY_RESUME */
/*
* To be removed when TIF_NOTIFY_RESUME has been implemented on
* m68k/xtensa
*/
#warning TIF_NOTIFY_RESUME not implemented
return -EOPNOTSUPP;
#endif /* !TIF_NOTIFY_RESUME */
}

/*****************************************************************************/
Expand Down

0 comments on commit a00ae4d

Please sign in to comment.