diff options
| author | David Howells <dhowells@redhat.com> | 2005-12-01 00:51:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:48:56 -0800 |
| commit | db1d1d57e97700b4131fe80556dc6ef976d534c4 (patch) | |
| tree | abdc78339b1c1bd4e37cb496c68424d9d7d98592 /security/keys/keyring.c | |
| parent | 5c72c343719a8c5dba675cd1b27b63c06bfe23d1 (diff) | |
| download | blackbird-op-linux-db1d1d57e97700b4131fe80556dc6ef976d534c4.tar.gz blackbird-op-linux-db1d1d57e97700b4131fe80556dc6ef976d534c4.zip | |
[PATCH] Keys: Fix permissions check for update vs add
Permit add_key() to once again update a matching key rather than adding a
new one if a matching key already exists in the target keyring.
This bug causes add_key() to always add a new key, displacing the old from
the target keyring.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index c7a0ab1cfda3..4e9fa8be44b8 100644 --- a/security/keys/keyring.c +++ b/security/keys/keyring.c @@ -526,7 +526,7 @@ key_ref_t __keyring_search_one(key_ref_t keyring_ref, (!key->type->match || key->type->match(key, description)) && key_permission(make_key_ref(key, possessed), - perm) < 0 && + perm) == 0 && !test_bit(KEY_FLAG_REVOKED, &key->flags) ) goto found; |
