Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a00ae4d21b2fa9379914f270ffffd8d3bec55430

Authored by Geert Uytterhoeven
Committed by James Morris
1 parent 6e14154676
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Keys: KEYCTL_SESSION_TO_PARENT needs TIF_NOTIFY_RESUME architecture support 

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
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>

Showing 1 changed file with 10 additions and 0 deletions Side-by-side Diff

security/keys/keyctl.c
Diff comments   View file @ a00ae4d
... ... @@ -1236,6 +1236,7 @@
1236 1236 */
1237 1237 long keyctl_session_to_parent(void)
1238 1238 {
  1239 +#ifdef TIF_NOTIFY_RESUME
1239 1240 struct task_struct *me, *parent;
1240 1241 const struct cred *mycred, *pcred;
1241 1242 struct cred *cred, *oldcred;
... ... @@ -1326,6 +1327,15 @@
1326 1327 error_keyring:
1327 1328 key_ref_put(keyring_r);
1328 1329 return ret;
  1330 +
  1331 +#else /* !TIF_NOTIFY_RESUME */
  1332 + /*
  1333 + * To be removed when TIF_NOTIFY_RESUME has been implemented on
  1334 + * m68k/xtensa
  1335 + */
  1336 +#warning TIF_NOTIFY_RESUME not implemented
  1337 + return -EOPNOTSUPP;
  1338 +#endif /* !TIF_NOTIFY_RESUME */
1329 1339 }
1330 1340  
1331 1341 /*****************************************************************************/