mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-13 07:44:00 +08:00
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>
This commit is contained in:
parent
6427e6c71c
commit
1d6d167c2e
@ -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);
|
||||
}
|
||||
|
@ -381,12 +381,11 @@ long keyctl_revoke_key(key_serial_t id)
|
||||
}
|
||||
|
||||
key = key_ref_to_ptr(key_ref);
|
||||
ret = 0;
|
||||
if (test_bit(KEY_FLAG_KEEP, &key->flags))
|
||||
return -EPERM;
|
||||
else {
|
||||
ret = -EPERM;
|
||||
else
|
||||
key_revoke(key);
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
key_ref_put(key_ref);
|
||||
error:
|
||||
@ -432,12 +431,11 @@ long keyctl_invalidate_key(key_serial_t id)
|
||||
|
||||
invalidate:
|
||||
key = key_ref_to_ptr(key_ref);
|
||||
ret = 0;
|
||||
if (test_bit(KEY_FLAG_KEEP, &key->flags))
|
||||
ret = -EPERM;
|
||||
else {
|
||||
else
|
||||
key_invalidate(key);
|
||||
ret = 0;
|
||||
}
|
||||
error_put:
|
||||
key_ref_put(key_ref);
|
||||
error:
|
||||
@ -1352,12 +1350,11 @@ long keyctl_set_timeout(key_serial_t id, unsigned timeout)
|
||||
|
||||
okay:
|
||||
key = key_ref_to_ptr(key_ref);
|
||||
ret = 0;
|
||||
if (test_bit(KEY_FLAG_KEEP, &key->flags))
|
||||
ret = -EPERM;
|
||||
else {
|
||||
else
|
||||
key_set_timeout(key, timeout);
|
||||
ret = 0;
|
||||
}
|
||||
key_put(key);
|
||||
|
||||
error:
|
||||
|
Loading…
Reference in New Issue
Block a user