adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support

Browse source 
As of commit ee18d64c1f ("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
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>
This commit is contained in:
Geert Uytterhoeven 2009-12-13 20:21:34 +01:00 committed by James Morris
parent 6e14154676
commit a00ae4d21b
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
security/keys/keyctl.c
View file

@ -1236,6 +1236,7 @@ long keyctl_get_security(key_serial_t keyid,
*/ */
long keyctl_session_to_parent(void) long keyctl_session_to_parent(void)
{ {
#ifdef TIF_NOTIFY_RESUME
struct task_struct *me, *parent; struct task_struct *me, *parent;
const struct cred *mycred, *pcred; const struct cred *mycred, *pcred;
struct cred *cred, *oldcred; struct cred *cred, *oldcred;
@ -1326,6 +1327,15 @@ not_permitted:
error_keyring: error_keyring:
key_ref_put(keyring_r); key_ref_put(keyring_r);
return ret; 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 */
} }
/*****************************************************************************/ /*****************************************************************************/