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/request_key.c | |
| parent | KEYS: Add a key type op to permit the key description to be vetted (diff) | |
| download | linux-dev-fdd1b94581782a2ddf9124414e5b7a5f48ce2f9c.tar.xz linux-dev-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/request_key.c')
| -rw-r--r-- | security/keys/request_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index a3dc0d460def..df3c0417ee40 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c @@ -585,7 +585,7 @@ int wait_for_key_construction(struct key *key, bool intr) if (ret < 0) return ret; if (test_bit(KEY_FLAG_NEGATIVE, &key->flags)) - return -ENOKEY; + return key->type_data.reject_error; return key_validate(key); } EXPORT_SYMBOL(wait_for_key_construction); |