git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
security
/
keys
/
keyring.c
diff --git
a/security/keys/keyring.c
b/security/keys/keyring.c
index
5620f08
..
cdd2f3f
100644
(file)
--- a/
security/keys/keyring.c
+++ b/
security/keys/keyring.c
@@
-352,7
+352,7
@@
key_ref_t keyring_search_aux(key_ref_t keyring_ref,
goto error_2;
if (key->expiry && now.tv_sec >= key->expiry)
goto error_2;
goto error_2;
if (key->expiry && now.tv_sec >= key->expiry)
goto error_2;
- key_ref = ERR_PTR(
-ENOKEY
);
+ key_ref = ERR_PTR(
key->type_data.reject_error
);
if (kflags & (1 << KEY_FLAG_NEGATIVE))
goto error_2;
goto found;
if (kflags & (1 << KEY_FLAG_NEGATIVE))
goto error_2;
goto found;
@@
-401,7
+401,7
@@
descend:
/* we set a different error code if we pass a negative key */
if (kflags & (1 << KEY_FLAG_NEGATIVE)) {
/* we set a different error code if we pass a negative key */
if (kflags & (1 << KEY_FLAG_NEGATIVE)) {
- err =
-ENOKEY
;
+ err =
key->type_data.reject_error
;
continue;
}
continue;
}