Keys: Replace duplicate non-updateable keys rather than failing
Subsystems (2)
David Howells
maintainerPATCH 1/1 Keys: Replace duplicate non-updateable keys rather than failing
The attached patch causes an attempt to add a duplicate non-updateable key (such as a keyring) to a keyring to discard the extant copy in favour of the new one rather than failing with EEXIST:
# do the test in an empty session keyctl session # create a new keyring called "a" and attach to session keyctl newring a @s # create another new keyring called "a" and attach to session, # displacing the keyring added by the second command: keyctl newring a @s
Without this patch, the third command will fail.
For updateable keys (such as those of "user" type), the update method will still be called rather than a new key being created.
Signed-off-by David Howells <[email protected]>
---
warthog>diffstat -p1 keys-replace-2616rc3.diff
security/keys/key.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
security/keys/key.c +9 -5
@@ -795,12 +795,16 @@ key_ref_t key_create_or_update(key_ref_t goto error_3; } -/* search for an existing key of the same type and description in the -* destination keyring +/* if it's possible to update this type of key, search for an existing +* key of the same type and description in the destination keyring and +* update that instead if possible */ - key_ref =__keyring_search_one (keyring_ref, ktype, description,0 ); -if (!IS_ERR (key_ref)) - goto found_matching_key; +if (ktype->update) { + key_ref =__keyring_search_one (keyring_ref, ktype, description, +0 ); +if (!IS_ERR (key_ref)) + goto found_matching_key; + }/* decide on the permissions we want */ perm =KEY_POS_VIEW |KEY_POS_SEARCH |KEY_POS_LINK |KEY_POS_SETATTR ;