diff --git a/[refs] b/[refs] index b22a45657cb4..492646f27938 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5593122eec26b061cc0b6fbff32118f1aadf4a27 +refs/heads/master: 0c2c9a3fc77e8b60d43d9bd2ca46eb4dddb0ff76 diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c index b85ace218395..1160b644dace 100644 --- a/trunk/security/keys/keyctl.c +++ b/trunk/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));