X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2Fkeys%2Frequest_key.c;h=5ecc5057fb542c1bb9f914e72f4b95695d05dd70;hb=4383f18b7f94a4d668c5eec68645c75d44556235;hp=6381e616c47744904b6efe0f412b0039289bec7d;hpb=0c326331c8b107abc0a160e8899d749150b8f76a;p=linux-2.6 diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 6381e616c4..5ecc5057fb 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -389,7 +389,7 @@ struct key *request_key_and_link(struct key_type *type, if (!IS_ERR(key_ref)) { key = key_ref_to_ptr(key_ref); } else if (PTR_ERR(key_ref) != -EAGAIN) { - key = ERR_PTR(PTR_ERR(key_ref)); + key = ERR_CAST(key_ref); } else { /* the search failed, but the keyrings were searchable, so we * should consult userspace if we can */