dns_key: add a function to verify the key description
Subsystems (2)
PATCH 5/5 dns_key: add a function to verify the key description
Signed-off-by Ben Boeckel <[email protected]>
--- net/dns_resolver/dns_key.c | 44 ++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-)
net/dns_resolver/dns_key.c +35 -9
@@ -45,6 +45,31 @@ const struct cred *dns_resolver_cache;#define DNS_ERRORNO_OPTION "dnserror" +/* +* The description must be of an optional type prefix and colon followed by the +* name to lookup. By default, the query type is a hostname to IP lookup. +*/ +static int +dns_resolver_vet_description (const char *desc) +{ +if (!*desc) +return -EINVAL ; +if (*desc =':' ) +return -EINVAL ; +for (; *desc; desc++) +if (*desc =':' ) + goto found_colon; + goto no_colon; + +found_colon: + desc++; +if (!*desc) +return -EINVAL ; + +no_colon: +return 0 ; +} +/* * Preparse instantiation data for a dns_resolver key. *
@@ -252,15 +277,16 @@ static long dns_resolver_read(const struct key *key, }struct key_type key_type_dns_resolver = { - .name ="dns_resolver" , - .preparse = dns_resolver_preparse, - .free_preparse = dns_resolver_free_preparse, - .instantiate = generic_key_instantiate, - .match_preparse = dns_resolver_match_preparse, - .revoke = user_revoke, - .destroy = user_destroy, - .describe = dns_resolver_describe, - .read = dns_resolver_read, + .name ="dns_resolver" , + .vet_description = dns_resolver_vet_description, + .preparse = dns_resolver_preparse, + .free_preparse = dns_resolver_free_preparse, + .instantiate = generic_key_instantiate, + .match_preparse = dns_resolver_match_preparse, + .revoke = user_revoke, + .destroy = user_destroy, + .describe = dns_resolver_describe, + .read = dns_resolver_read, };static int __init init_dns_resolver (void )
Signature · 1 line
2.17.1
David Howells
maintainerYou can actually vet the description in ->preparse(). ->vet_description() is redundant if all key types implement ->preparse().
David
Quoted 2 lines · David Howells
You can actually vet the description in ->preparse(). ->vet_description() is redundant if all key types implement ->preparse().
Would it be better to do so in ->preparse() then? Currently the only place it is verified (that I can find) is in the userspace key.dns_resovler.
--Ben