diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /security/keys/process_keys.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
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)) { |