diff options
| author | David Howells <dhowells@redhat.com> | 2011-03-07 15:06:09 +0000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-08 11:17:18 +1100 |
| commit | fdd1b94581782a2ddf9124414e5b7a5f48ce2f9c (patch) | |
| tree | ce83bfd1f0b1a7d4b9521bdb3d6afef1bff1d4f2 /security/keys/keyring.c | |
| parent | b9fffa3877a3ebbe0a5ad5a247358e2f7df15b24 (diff) | |
| download | kernel_samsung_smdk4412-fdd1b94581782a2ddf9124414e5b7a5f48ce2f9c.tar.gz kernel_samsung_smdk4412-fdd1b94581782a2ddf9124414e5b7a5f48ce2f9c.tar.bz2 kernel_samsung_smdk4412-fdd1b94581782a2ddf9124414e5b7a5f48ce2f9c.zip | |
KEYS: Add a new keyctl op to reject a key with a specified error code
Add a new keyctl op to reject a key with a specified error code. This works
much the same as negating a key, and so keyctl_negate_key() is made a special
case of keyctl_reject_key(). The difference is that keyctl_negate_key()
selects ENOKEY as the error to be reported.
Typically the key would be rejected with EKEYEXPIRED, EKEYREVOKED or
EKEYREJECTED, but this is not mandatory.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/keys/keyring.c')
| -rw-r--r-- | security/keys/keyring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/keyring.c b/security/keys/keyring.c index 5620f084ded..cdd2f3f88c8 100644 --- 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; - 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; @@ -401,7 +401,7 @@ descend: /* 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; } |