diff options
author | James Morris <jmorris@namei.org> | 2011-03-30 08:51:46 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-03-30 08:51:46 +1100 |
commit | 93b9c98b3498db5842e2812b32cff4c1ae947eb1 (patch) | |
tree | 2d18e46cadcbf66fff695bb16e86531281cde7be /security/keys/proc.c | |
parent | efb3bb4fad062f8e9b8c9c945d499597e14007e7 (diff) | |
parent | 5806896019ceaa0a1e808182afb4bba33c948ad6 (diff) | |
download | talos-op-linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.tar.gz talos-op-linux-93b9c98b3498db5842e2812b32cff4c1ae947eb1.zip |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/keys/proc.c')
-rw-r--r-- | security/keys/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index 525cf8a29cdd..49bbc97943ad 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c @@ -199,7 +199,7 @@ static int proc_keys_show(struct seq_file *m, void *v) if (key->perm & KEY_POS_VIEW) { skey_ref = search_my_process_keyrings(key->type, key, lookup_user_key_possessed, - cred); + true, cred); if (!IS_ERR(skey_ref)) { key_ref_put(skey_ref); key_ref = make_key_ref(key, 1); |