diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
| commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
| tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /security/keys/process_keys.c | |
| parent | f241be74b803dcf9d70c9978292946370654320f (diff) | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'security/keys/process_keys.c')
| -rw-r--r-- | security/keys/process_keys.c | 2 |
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) | |||
| 678 | keyring = keyring_alloc(name, tsk->uid, tsk->gid, 0, NULL); | 678 | keyring = keyring_alloc(name, tsk->uid, tsk->gid, 0, NULL); |
| 679 | if (IS_ERR(keyring)) { | 679 | if (IS_ERR(keyring)) { |
| 680 | ret = PTR_ERR(keyring); | 680 | ret = PTR_ERR(keyring); |
| 681 | goto error; | 681 | goto error2; |
| 682 | } | 682 | } |
| 683 | } | 683 | } |
| 684 | else if (IS_ERR(keyring)) { | 684 | else if (IS_ERR(keyring)) { |