lkml.org 
[lkml]   [2009]   [Aug]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/6] KEYS: Allow keyctl_revoke() on keys that have SETATTR but not WRITE perm [ver #2]
    Date
    Allow keyctl_revoke() to operate on keys that have SETATTR but not WRITE
    permission, rather than only on keys that have WRITE permission.

    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    ---

    security/keys/keyctl.c | 8 +++++++-
    1 files changed, 7 insertions(+), 1 deletions(-)


    diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
    index b85ace2..1160b64 100644
    --- a/security/keys/keyctl.c
    +++ b/security/keys/keyctl.c
    @@ -343,7 +343,13 @@ long keyctl_revoke_key(key_serial_t id)
    key_ref = lookup_user_key(id, 0, KEY_WRITE);
    if (IS_ERR(key_ref)) {
    ret = PTR_ERR(key_ref);
    - goto error;
    + if (ret != -EACCES)
    + goto error;
    + key_ref = lookup_user_key(id, 0, KEY_SETATTR);
    + if (IS_ERR(key_ref)) {
    + ret = PTR_ERR(key_ref);
    + goto error;
    + }
    }

    key_revoke(key_ref_to_ptr(key_ref));


    \
     
     \ /
      Last update: 2009-08-04 22:43    [W:0.021 / U:29.572 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site