summaryrefslogtreecommitdiffstats
path: root/security/keys/process_keys.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-09 17:51:35 +0200
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-08-09 17:51:35 +0200
commitc973b112c76c9d8fd042991128f218a738cc8d0a (patch)
treee813b0da5d0a0e19e06de6462d145a29ad683026 /security/keys/process_keys.c
parentMerge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff)
parent[PATCH] fsnotify-cleanups (diff)
downloadlinux-c973b112c76c9d8fd042991128f218a738cc8d0a.tar.xz
linux-c973b112c76c9d8fd042991128f218a738cc8d0a.zip
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'security/keys/process_keys.c')
-rw-r--r--security/keys/process_keys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
index 9b0369c5a223..c089f78fb94e 100644
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
@@ -678,7 +678,7 @@ long join_session_keyring(const char *name)
keyring = keyring_alloc(name, tsk->uid, tsk->gid, 0, NULL);
if (IS_ERR(keyring)) {
ret = PTR_ERR(keyring);
- goto error;
+ goto error2;
}
}
else if (IS_ERR(keyring)) {