diff options
| author | David Howells <dhowells@redhat.com> | 2014-07-18 13:56:36 -0400 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-22 16:46:55 -0400 |
| commit | f1dcde91a3503f68ef209667a8798ead2b50b02a (patch) | |
| tree | 44a93a6da7868c58606f39421870b32a920b3e77 /security | |
| parent | 5d19e20b534ff4c17dfba792f1f9e33e1378e3f9 (diff) | |
KEYS: request_key_auth: Provide key preparsing
Provide key preparsing for the request_key_auth key type so that we can make
preparsing mandatory. This does nothing as this type can only be set up
internally to the kernel.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Steve Dickson <steved@redhat.com>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/request_key_auth.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 7495a93b4b90..842e6f410d50 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c | |||
| @@ -20,6 +20,8 @@ | |||
| 20 | #include "internal.h" | 20 | #include "internal.h" |
| 21 | #include <keys/user-type.h> | 21 | #include <keys/user-type.h> |
| 22 | 22 | ||
| 23 | static int request_key_auth_preparse(struct key_preparsed_payload *); | ||
| 24 | static void request_key_auth_free_preparse(struct key_preparsed_payload *); | ||
| 23 | static int request_key_auth_instantiate(struct key *, | 25 | static int request_key_auth_instantiate(struct key *, |
| 24 | struct key_preparsed_payload *); | 26 | struct key_preparsed_payload *); |
| 25 | static void request_key_auth_describe(const struct key *, struct seq_file *); | 27 | static void request_key_auth_describe(const struct key *, struct seq_file *); |
| @@ -33,6 +35,8 @@ static long request_key_auth_read(const struct key *, char __user *, size_t); | |||
| 33 | struct key_type key_type_request_key_auth = { | 35 | struct key_type key_type_request_key_auth = { |
| 34 | .name = ".request_key_auth", | 36 | .name = ".request_key_auth", |
| 35 | .def_datalen = sizeof(struct request_key_auth), | 37 | .def_datalen = sizeof(struct request_key_auth), |
| 38 | .preparse = request_key_auth_preparse, | ||
| 39 | .free_preparse = request_key_auth_free_preparse, | ||
| 36 | .instantiate = request_key_auth_instantiate, | 40 | .instantiate = request_key_auth_instantiate, |
| 37 | .describe = request_key_auth_describe, | 41 | .describe = request_key_auth_describe, |
| 38 | .revoke = request_key_auth_revoke, | 42 | .revoke = request_key_auth_revoke, |
| @@ -40,6 +44,15 @@ struct key_type key_type_request_key_auth = { | |||
| 40 | .read = request_key_auth_read, | 44 | .read = request_key_auth_read, |
| 41 | }; | 45 | }; |
| 42 | 46 | ||
| 47 | int request_key_auth_preparse(struct key_preparsed_payload *prep) | ||
| 48 | { | ||
| 49 | return 0; | ||
| 50 | } | ||
| 51 | |||
| 52 | void request_key_auth_free_preparse(struct key_preparsed_payload *prep) | ||
| 53 | { | ||
| 54 | } | ||
| 55 | |||
| 43 | /* | 56 | /* |
| 44 | * Instantiate a request-key authorisation key. | 57 | * Instantiate a request-key authorisation key. |
| 45 | */ | 58 | */ |
