diff options
| author | Kees Cook <keescook@google.com> | 2016-01-20 23:39:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-20 23:39:43 +0000 |
| commit | e0e7aae1752ad78bcf172a1a3a26a7b3fc8f230b (patch) | |
| tree | e2922ad9720579154477b38bd4597019843721e9 | |
| parent | f50fa4cb6f8e34cf991c5e127c6d9ce66df0844d (diff) | |
| parent | cf5c1b24a5f26cb7d22e153312f76287a0e1bc52 (diff) | |
| download | pxa-v3.14-e0e7aae1752ad78bcf172a1a3a26a7b3fc8f230b.tar.gz | |
Merge "UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()" into pxa-3.14
| -rw-r--r-- | security/keys/process_keys.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 0cf8a130a26..4e56371f239 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c @@ -793,6 +793,7 @@ long join_session_keyring(const char *name) ret = PTR_ERR(keyring); goto error2; } else if (keyring == new->session_keyring) { + key_put(keyring); ret = 0; goto error2; } |