diff options
| author |   David Howells <dhowells@redhat.com> | 2019-06-26 21:02:32 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-06-26 21:02:32 +0100 |
| commit | dcf49dbc8077e278ddd1bc7298abc781496e8a08 (patch) | |
| tree | e187765e6336fefc35d83f5b75b7cbe1d4ec194a /security/keys/keyctl.c | |
| parent | keys: Cache the hash value to avoid lots of recalculation (diff) | |
| download | linux-dev-dcf49dbc8077e278ddd1bc7298abc781496e8a08.tar.xz linux-dev-dcf49dbc8077e278ddd1bc7298abc781496e8a08.zip | |
keys: Add a 'recurse' flag for keyring searches
Add a 'recurse' flag for keyring searches so that the flag can be omitted
and recursion disabled, thereby allowing just the nominated keyring to be
searched and none of the children.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 9f418e66f067..169409b611b0 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -762,7 +762,7 @@ long keyctl_keyring_search(key_serial_t ringid, } /* do the search */ - key_ref = keyring_search(keyring_ref, ktype, description); + key_ref = keyring_search(keyring_ref, ktype, description, true); if (IS_ERR(key_ref)) { ret = PTR_ERR(key_ref); |