Eric Lee / smarc-ti-linux-kernel

2
Download as
Browse Code ยป

Commit c06cfb08b88dfbe13be44a69ae2fdc3a7c902d81

Authored by David Howells
1 parent 614d8c3901
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

KEYS: Remove key_type::match in favour of overriding default by match_preparse 

A previous patch added a ->match_preparse() method to the key type.  This is
allowed to override the function called by the iteration algorithm.
Therefore, we can just set a default that simply checks for an exact match of
the key description with the original criterion data and allow match_preparse
to override it as needed.

The key_type::match op is then redundant and can be removed, as can the
user_match() function.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>

Showing 19 changed files with 31 additions and 45 deletions Side-by-side Diff

crypto/asymmetric_keys/asymmetric_type.c
Diff comments   View file @ c06cfb0
... ... @@ -59,8 +59,8 @@
59 59 * "id:<id>" - request a key matching the ID
60 60 * "<subtype>:<id>" - request a key of a subtype
61 61 */
62   -static int asymmetric_key_match(const struct key *key,
63   - const struct key_match_data *match_data)
  62 +static int asymmetric_key_cmp(const struct key *key,
  63 + const struct key_match_data *match_data)
64 64 {
65 65 const struct asymmetric_key_subtype *subtype = asymmetric_key_subtype(key);
66 66 const char *description = match_data->raw_data;
... ... @@ -110,6 +110,7 @@
110 110 static int asymmetric_key_match_preparse(struct key_match_data *match_data)
111 111 {
112 112 match_data->lookup_type = KEYRING_SEARCH_LOOKUP_ITERATE;
  113 + match_data->cmp = asymmetric_key_cmp;
113 114 return 0;
114 115 }
115 116  
... ... @@ -224,7 +225,6 @@
224 225 .free_preparse = asymmetric_key_free_preparse,
225 226 .instantiate = generic_key_instantiate,
226 227 .match_preparse = asymmetric_key_match_preparse,
227   - .match = asymmetric_key_match,
228 228 .match_free = asymmetric_key_match_free,
229 229 .destroy = asymmetric_key_destroy,
230 230 .describe = asymmetric_key_describe,
crypto/asymmetric_keys/pkcs7_key_type.c
Diff comments   View file @ c06cfb0
... ... @@ -75,7 +75,6 @@
75 75 .preparse = pkcs7_preparse,
76 76 .free_preparse = user_free_preparse,
77 77 .instantiate = generic_key_instantiate,
78   - .match = user_match,
79 78 .revoke = user_revoke,
80 79 .destroy = user_destroy,
81 80 .describe = user_describe,
fs/cifs/cifs_spnego.c
Diff comments   View file @ c06cfb0
... ... @@ -62,7 +62,6 @@
62 62 struct key_type cifs_spnego_key_type = {
63 63 .name = "cifs.spnego",
64 64 .instantiate = cifs_spnego_key_instantiate,
65   - .match = user_match,
66 65 .destroy = cifs_spnego_key_destroy,
67 66 .describe = user_describe,
68 67 };
... ... @@ -84,7 +84,6 @@
84 84 .instantiate = cifs_idmap_key_instantiate,
85 85 .destroy = cifs_idmap_key_destroy,
86 86 .describe = user_describe,
87   - .match = user_match,
88 87 };
89 88  
90 89 static char *
... ... @@ -177,7 +177,6 @@
177 177 .preparse = user_preparse,
178 178 .free_preparse = user_free_preparse,
179 179 .instantiate = generic_key_instantiate,
180   - .match = user_match,
181 180 .revoke = user_revoke,
182 181 .destroy = user_destroy,
183 182 .describe = user_describe,
... ... @@ -401,7 +400,6 @@
401 400 .preparse = user_preparse,
402 401 .free_preparse = user_free_preparse,
403 402 .instantiate = generic_key_instantiate,
404   - .match = user_match,
405 403 .revoke = user_revoke,
406 404 .destroy = user_destroy,
407 405 .describe = user_describe,
include/keys/user-type.h
Diff comments   View file @ c06cfb0
... ... @@ -36,13 +36,10 @@
36 36 extern struct key_type key_type_logon;
37 37  
38 38 struct key_preparsed_payload;
39   -struct key_match_data;
40 39  
41 40 extern int user_preparse(struct key_preparsed_payload *prep);
42 41 extern void user_free_preparse(struct key_preparsed_payload *prep);
43 42 extern int user_update(struct key *key, struct key_preparsed_payload *prep);
44   -extern int user_match(const struct key *key,
45   - const struct key_match_data *match_data);
46 43 extern void user_revoke(struct key *key);
47 44 extern void user_destroy(struct key *key);
48 45 extern void user_describe(const struct key *user, struct seq_file *m);
include/linux/key-type.h
Diff comments   View file @ c06cfb0
... ... @@ -113,10 +113,6 @@
113 113 */
114 114 int (*match_preparse)(struct key_match_data *match_data);
115 115  
116   - /* match a key against a description */
117   - int (*match)(const struct key *key,
118   - const struct key_match_data *match_data);
119   -
120 116 /* Free preparsed match data (optional). This should be supplied it
121 117 * ->match_preparse() is supplied. */
122 118 void (*match_free)(struct key_match_data *match_data);
... ... @@ -476,7 +476,6 @@
476 476 .preparse = ceph_key_preparse,
477 477 .free_preparse = ceph_key_free_preparse,
478 478 .instantiate = generic_key_instantiate,
479   - .match = user_match,
480 479 .destroy = ceph_key_destroy,
481 480 };
482 481  
net/dns_resolver/dns_key.c
Diff comments   View file @ c06cfb0
... ... @@ -176,9 +176,8 @@
176 176 * The domain name may be a simple name or an absolute domain name (which
177 177 * should end with a period). The domain name is case-independent.
178 178 */
179   -static int
180   -dns_resolver_match(const struct key *key,
181   - const struct key_match_data *match_data)
  179 +static int dns_resolver_cmp(const struct key *key,
  180 + const struct key_match_data *match_data)
182 181 {
183 182 int slen, dlen, ret = 0;
184 183 const char *src = key->description, *dsp = match_data->raw_data;
... ... @@ -210,6 +209,16 @@
210 209 }
211 210  
212 211 /*
  212 + * Preparse the match criterion.
  213 + */
  214 +static int dns_resolver_match_preparse(struct key_match_data *match_data)
  215 +{
  216 + match_data->lookup_type = KEYRING_SEARCH_LOOKUP_ITERATE;
  217 + match_data->cmp = dns_resolver_cmp;
  218 + return 0;
  219 +}
  220 +
  221 +/*
213 222 * Describe a DNS key
214 223 */
215 224 static void dns_resolver_describe(const struct key *key, struct seq_file *m)
... ... @@ -243,7 +252,7 @@
243 252 .preparse = dns_resolver_preparse,
244 253 .free_preparse = dns_resolver_free_preparse,
245 254 .instantiate = generic_key_instantiate,
246   - .match = dns_resolver_match,
  255 + .match_preparse = dns_resolver_match_preparse,
247 256 .revoke = user_revoke,
248 257 .destroy = user_destroy,
249 258 .describe = dns_resolver_describe,
... ... @@ -44,7 +44,6 @@
44 44 .preparse = rxrpc_preparse,
45 45 .free_preparse = rxrpc_free_preparse,
46 46 .instantiate = generic_key_instantiate,
47   - .match = user_match,
48 47 .destroy = rxrpc_destroy,
49 48 .describe = rxrpc_describe,
50 49 .read = rxrpc_read,
... ... @@ -61,7 +60,6 @@
61 60 .preparse = rxrpc_preparse_s,
62 61 .free_preparse = rxrpc_free_preparse_s,
63 62 .instantiate = generic_key_instantiate,
64   - .match = user_match,
65 63 .destroy = rxrpc_destroy_s,
66 64 .describe = rxrpc_describe,
67 65 };
security/keys/big_key.c
Diff comments   View file @ c06cfb0
... ... @@ -36,7 +36,6 @@
36 36 .preparse = big_key_preparse,
37 37 .free_preparse = big_key_free_preparse,
38 38 .instantiate = generic_key_instantiate,
39   - .match = user_match,
40 39 .revoke = big_key_revoke,
41 40 .destroy = big_key_destroy,
42 41 .describe = big_key_describe,
security/keys/encrypted-keys/encrypted.c
Diff comments   View file @ c06cfb0
... ... @@ -970,7 +970,6 @@
970 970 .name = "encrypted",
971 971 .instantiate = encrypted_instantiate,
972 972 .update = encrypted_update,
973   - .match = user_match,
974 973 .destroy = encrypted_destroy,
975 974 .describe = user_describe,
976 975 .read = encrypted_read,
security/keys/internal.h
Diff comments   View file @ c06cfb0
... ... @@ -127,6 +127,8 @@
127 127 struct timespec now;
128 128 };
129 129  
  130 +extern int key_default_cmp(const struct key *key,
  131 + const struct key_match_data *match_data);
130 132 extern key_ref_t keyring_search_aux(key_ref_t keyring_ref,
131 133 struct keyring_search_context *ctx);
132 134  
... ... @@ -799,7 +799,7 @@
799 799 }
800 800  
801 801 key_ref = ERR_PTR(-EINVAL);
802   - if (!index_key.type->match || !index_key.type->instantiate ||
  802 + if (!index_key.type->instantiate ||
803 803 (!index_key.description && !index_key.type->preparse))
804 804 goto error_put_type;
805 805  
security/keys/keyring.c
Diff comments   View file @ c06cfb0
... ... @@ -89,7 +89,6 @@
89 89 .preparse = keyring_preparse,
90 90 .free_preparse = keyring_free_preparse,
91 91 .instantiate = keyring_instantiate,
92   - .match = user_match,
93 92 .revoke = keyring_revoke,
94 93 .destroy = keyring_destroy,
95 94 .describe = keyring_describe,
... ... @@ -512,6 +511,15 @@
512 511 EXPORT_SYMBOL(keyring_alloc);
513 512  
514 513 /*
  514 + * By default, we keys found by getting an exact match on their descriptions.
  515 + */
  516 +int key_default_cmp(const struct key *key,
  517 + const struct key_match_data *match_data)
  518 +{
  519 + return strcmp(key->description, match_data->raw_data) == 0;
  520 +}
  521 +
  522 +/*
515 523 * Iteration function to consider each key found.
516 524 */
517 525 static int keyring_search_iterator(const void *object, void *iterator_data)
518 526  
... ... @@ -884,16 +892,13 @@
884 892 .index_key.type = type,
885 893 .index_key.description = description,
886 894 .cred = current_cred(),
887   - .match_data.cmp = type->match,
  895 + .match_data.cmp = key_default_cmp,
888 896 .match_data.raw_data = description,
889 897 .match_data.lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT,
890 898 .flags = KEYRING_SEARCH_DO_STATE_CHECK,
891 899 };
892 900 key_ref_t key;
893 901 int ret;
894   -
895   - if (!ctx.match_data.cmp)
896   - return ERR_PTR(-ENOKEY);
897 902  
898 903 if (type->match_preparse) {
899 904 ret = type->match_preparse(&ctx.match_data);
security/keys/request_key.c
Diff comments   View file @ c06cfb0
... ... @@ -531,7 +531,7 @@
531 531 .index_key.type = type,
532 532 .index_key.description = description,
533 533 .cred = current_cred(),
534   - .match_data.cmp = type->match,
  534 + .match_data.cmp = key_default_cmp,
535 535 .match_data.raw_data = description,
536 536 .match_data.lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT,
537 537 };
security/keys/request_key_auth.c
Diff comments   View file @ c06cfb0
... ... @@ -246,7 +246,7 @@
246 246 .index_key.type = &key_type_request_key_auth,
247 247 .index_key.description = description,
248 248 .cred = current_cred(),
249   - .match_data.cmp = user_match,
  249 + .match_data.cmp = key_default_cmp,
250 250 .match_data.raw_data = description,
251 251 .match_data.lookup_type = KEYRING_SEARCH_LOOKUP_DIRECT,
252 252 };
security/keys/trusted.c
Diff comments   View file @ c06cfb0
... ... @@ -1096,7 +1096,6 @@
1096 1096 .name = "trusted",
1097 1097 .instantiate = trusted_instantiate,
1098 1098 .update = trusted_update,
1099   - .match = user_match,
1100 1099 .destroy = trusted_destroy,
1101 1100 .describe = user_describe,
1102 1101 .read = trusted_read,
security/keys/user_defined.c
Diff comments   View file @ c06cfb0
... ... @@ -30,7 +30,6 @@
30 30 .free_preparse = user_free_preparse,
31 31 .instantiate = generic_key_instantiate,
32 32 .update = user_update,
33   - .match = user_match,
34 33 .revoke = user_revoke,
35 34 .destroy = user_destroy,
36 35 .describe = user_describe,
... ... @@ -51,7 +50,6 @@
51 50 .free_preparse = user_free_preparse,
52 51 .instantiate = generic_key_instantiate,
53 52 .update = user_update,
54   - .match = user_match,
55 53 .revoke = user_revoke,
56 54 .destroy = user_destroy,
57 55 .describe = user_describe,
... ... @@ -135,16 +133,6 @@
135 133 }
136 134  
137 135 EXPORT_SYMBOL_GPL(user_update);
138   -
139   -/*
140   - * match users on their name
141   - */
142   -int user_match(const struct key *key, const struct key_match_data *match_data)
143   -{
144   - return strcmp(key->description, match_data->raw_data) == 0;
145   -}
146   -
147   -EXPORT_SYMBOL_GPL(user_match);
148 136  
149 137 /*
150 138 * dispose of the links from a revoked keyring