mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 11:50:43 +09:00
Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support
commita00ae4d21bupstream. As of commitee18d64c1f("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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
7fcb55881e
commit
fb70ac4b23
@@ -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
|
||||
* m68k/xtensa
|
||||
*/
|
||||
#warning TIF_NOTIFY_RESUME not implemented
|
||||
return -EOPNOTSUPP;
|
||||
#endif /* !TIF_NOTIFY_RESUME */
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
Reference in New Issue
Block a user