Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowel...

[sfrench/cifs-2.6.git] / security / keys / gc.c

diff --git a/security/keys/gc.c b/security/keys/gc.c
index 671dd730ecfc9e62395b2a7bf046f76f0f9ad313..48c3e124c2729bcaf198841b381d56b096a6cc89 100644 (file)
--- a/security/keys/gc.c
+++ b/security/keys/gc.c
@@ -151,6 +151,7 @@ static noinline void key_gc_unused_keys(struct list_head *keys)
 
                key_user_put(key->user);
                key_put_tag(key->domain_tag);
+               key_put_acl(rcu_access_pointer(key->acl));
                kfree(key->description);
 
                memzero_explicit(key, sizeof(*key));
@@ -220,7 +221,6 @@ continue_scanning:
                        if (key->type == key_gc_dead_keytype) {
                                gc_state |= KEY_GC_FOUND_DEAD_KEY;
                                set_bit(KEY_FLAG_DEAD, &key->flags);
-                               key->perm = 0;
                                goto skip_dead_key;
                        } else if (key->type == &key_type_keyring &&
                                   key->restrict_link) {