| commit | e0e7aae1752ad78bcf172a1a3a26a7b3fc8f230b | [log] [tgz] |
|---|---|---|
| author | Kees Cook <keescook@google.com> | Wed Jan 20 23:39:43 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 20 23:39:43 2016 +0000 |
| tree | e2922ad9720579154477b38bd4597019843721e9 | |
| parent | f50fa4cb6f8e34cf991c5e127c6d9ce66df0844d [diff] | |
| parent | cf5c1b24a5f26cb7d22e153312f76287a0e1bc52 [diff] |
Merge "UPSTREAM: KEYS: Fix keyring ref leak in join_session_keyring()" into pxa-3.14
diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c index 0cf8a13..4e56371 100644 --- a/security/keys/process_keys.c +++ b/security/keys/process_keys.c
@@ -793,6 +793,7 @@ ret = PTR_ERR(keyring); goto error2; } else if (keyring == new->session_keyring) { + key_put(keyring); ret = 0; goto error2; }