diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-01-07 07:46:36 -0500 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-01-07 12:56:42 -0500 |
| commit | 1d6d167c2efcfe9539d9cffb1a1be9c92e39c2c0 (patch) | |
| tree | f875b8a19d539701b31ea4ffce40eee77c701103 /security/keys/key.c | |
| parent | 6427e6c71c8b374761b661c4f355762794c171a1 (diff) | |
| download | blackbird-op-linux-1d6d167c2efcfe9539d9cffb1a1be9c92e39c2c0.tar.gz blackbird-op-linux-1d6d167c2efcfe9539d9cffb1a1be9c92e39c2c0.zip | |
KEYS: refcount bug fix
This patch fixes the key_ref leak, removes the unnecessary KEY_FLAG_KEEP
test before setting the flag, and cleans up the if/then brackets style
introduced in commit:
d3600bc KEYS: prevent keys from being removed from specified keyrings
Reported-by: David Howells <dhowells@redhat.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security/keys/key.c')
| -rw-r--r-- | security/keys/key.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 09ef276c4bdc..07a87311055c 100644 --- a/security/keys/key.c +++ b/security/keys/key.c @@ -430,8 +430,7 @@ static int __key_instantiate_and_link(struct key *key, /* and link it into the destination keyring */ if (keyring) { - if (test_bit(KEY_FLAG_KEEP, &keyring->flags)) - set_bit(KEY_FLAG_KEEP, &key->flags); + set_bit(KEY_FLAG_KEEP, &key->flags); __key_link(key, _edit); } |
