From 8dc19d81bae9ca032d5c693b8ec000e6188f8ced Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 10 Sep 2010 09:59:51 +0100 Subject: [PATCH] --- yaml --- r: 210531 b: refs/heads/master c: 3d96406c7da1ed5811ea52a3b0905f4f0e295376 h: refs/heads/master i: 210529: b1ff6a38bbe8b075a7487873ff798532f0c2310d 210527: 00655ce3037bc1a8bce1387a63a01180f18cdafc v: v3 --- [refs] | 2 +- trunk/security/keys/keyctl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e88c0c9e8695..4f95388b167c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d1ac65a9698513d00e5608d93fca0c53f536c14 +refs/heads/master: 3d96406c7da1ed5811ea52a3b0905f4f0e295376 diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c index 3868c6700b58..60924f6a52db 100644 --- a/trunk/security/keys/keyctl.c +++ b/trunk/security/keys/keyctl.c @@ -1305,7 +1305,8 @@ long keyctl_session_to_parent(void) goto not_permitted; /* the keyrings must have the same UID */ - if (pcred->tgcred->session_keyring->uid != mycred->euid || + if ((pcred->tgcred->session_keyring && + pcred->tgcred->session_keyring->uid != mycred->euid) || mycred->tgcred->session_keyring->uid != mycred->euid) goto not_permitted;