diff options
author | James Morris <jmorris@namei.org> | 2011-05-24 22:55:24 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-24 22:55:24 +1000 |
commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /security/keys/request_key.c | |
parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
parent | 12a5a2621b1ee14d32beca35304d7c6076a58815 (diff) | |
download | kernel_samsung_smdk4412-434d42cfd05a7cc452457a81d2029540cba12150.zip kernel_samsung_smdk4412-434d42cfd05a7cc452457a81d2029540cba12150.tar.gz kernel_samsung_smdk4412-434d42cfd05a7cc452457a81d2029540cba12150.tar.bz2 |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/keys/request_key.c')
-rw-r--r-- | security/keys/request_key.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index df3c041..b18a717 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -530,8 +530,7 @@ struct key *request_key_and_link(struct key_type *type, dest_keyring, flags); /* search all the process keyrings for a key */ - key_ref = search_process_keyrings(type, description, type->match, - cred); + key_ref = search_process_keyrings(type, description, type->match, cred); if (!IS_ERR(key_ref)) { key = key_ref_to_ptr(key_ref); |