diff options
| author |   David Howells <dhowells@redhat.com> | 2013-09-24 10:35:16 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2013-09-24 10:35:16 +0100 |
| commit | ccc3e6d9c9aea07a0b60b2b0bfc5b05a704b66d5 (patch) | |
| tree | d111175934b1454fa275fe056f8c6d320e504b01 /security/keys/keyring.c | |
| parent | KEYS: Search for auth-key by name rather than target key ID (diff) | |
| download | linux-dev-ccc3e6d9c9aea07a0b60b2b0bfc5b05a704b66d5.tar.xz linux-dev-ccc3e6d9c9aea07a0b60b2b0bfc5b05a704b66d5.zip | |
KEYS: Define a __key_get() wrapper to use rather than atomic_inc()
Define a __key_get() wrapper to use rather than atomic_inc() on the key usage
count as this makes it easier to hook in refcount error debugging.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index b42f2d4f7f83..87eff32b53f4 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -479,7 +479,7 @@ not_this_keyring: /* we found a viable match */ found: - atomic_inc(&key->usage); + __key_get(key); key->last_used_at = ctx->now.tv_sec; keyring->last_used_at = ctx->now.tv_sec; while (sp > 0) @@ -573,7 +573,7 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref, return ERR_PTR(-ENOKEY); found: - atomic_inc(&key->usage); + __key_get(key); keyring->last_used_at = key->last_used_at = current_kernel_time().tv_sec; rcu_read_unlock(); @@ -909,7 +909,7 @@ void __key_link(struct key *keyring, struct key *key, klist = rcu_dereference_locked_keyring(keyring); - atomic_inc(&key->usage); + __key_get(key); keyring->last_used_at = key->last_used_at = current_kernel_time().tv_sec; |