diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-17 12:13:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-17 12:13:40 +1000 |
| commit | d4270aa048edd39a1325c5565f3ff1cdbdee631b (patch) | |
| tree | 39b3b82820cf61f0cf3f5bff27ad580330fd8c02 /security | |
| parent | 106036677c6434d45fea9ed2f8aec93b7d37ebed (diff) | |
| parent | 4d67431f80b1b822f0286afc9123ee453eac7334 (diff) | |
Merge remote-tracking branch 'security-testing/next'
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/request_key_auth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 6cff37529b80..60d4e3f5e4bb 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -251,6 +251,8 @@ struct key *key_get_instantiation_authkey(key_serial_t target_id) if (IS_ERR(authkey_ref)) { authkey = ERR_CAST(authkey_ref); + if (authkey == ERR_PTR(-EAGAIN)) + authkey = ERR_PTR(-ENOKEY); goto error; } |