diff --git a/[refs] b/[refs] index 0f228547f3ae..eae8ebc24338 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 +refs/heads/master: fe9453a1dcb5fb146f9653267e78f4a558066f6f diff --git a/trunk/security/keys/process_keys.c b/trunk/security/keys/process_keys.c index 20e4bf57aec8..58dfe0890947 100644 --- a/trunk/security/keys/process_keys.c +++ b/trunk/security/keys/process_keys.c @@ -367,6 +367,8 @@ key_ref_t search_my_process_keyrings(struct key_type *type, switch (PTR_ERR(key_ref)) { case -EAGAIN: /* no key */ + if (ret) + break; case -ENOKEY: /* negative key */ ret = key_ref; break;