---

yaml --- r: 210531 b: refs/heads/master c: 3d96406 h: refs/heads/master i: 210529: b1ff6a3 210527: 00655ce v: v3
git-mirror · Sep 10, 2010 · 8dc19d8 · 8dc19d8
1 parent e47ef1f
commit 8dc19d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;