1 // SPDX-License-Identifier: GPL-2.0-or-later 1 // SPDX-License-Identifier: GPL-2.0-or-later
2 /* 2 /*
3 * Cryptographic API for algorithms (i.e., low 3 * Cryptographic API for algorithms (i.e., low-level API).
4 * 4 *
5 * Copyright (c) 2006 Herbert Xu <herbert@gond 5 * Copyright (c) 2006 Herbert Xu <herbert@gondor.apana.org.au>
6 */ 6 */
7 7
8 #include <crypto/algapi.h> 8 #include <crypto/algapi.h>
9 #include <crypto/internal/simd.h> <<
10 #include <linux/err.h> 9 #include <linux/err.h>
11 #include <linux/errno.h> 10 #include <linux/errno.h>
12 #include <linux/fips.h> 11 #include <linux/fips.h>
13 #include <linux/init.h> 12 #include <linux/init.h>
14 #include <linux/kernel.h> 13 #include <linux/kernel.h>
15 #include <linux/list.h> 14 #include <linux/list.h>
16 #include <linux/module.h> 15 #include <linux/module.h>
17 #include <linux/rtnetlink.h> 16 #include <linux/rtnetlink.h>
18 #include <linux/slab.h> 17 #include <linux/slab.h>
19 #include <linux/string.h> 18 #include <linux/string.h>
20 #include <linux/workqueue.h> <<
21 19
22 #include "internal.h" 20 #include "internal.h"
23 21
24 static LIST_HEAD(crypto_template_list); 22 static LIST_HEAD(crypto_template_list);
25 23
26 #ifdef CONFIG_CRYPTO_MANAGER_EXTRA_TESTS <<
27 DEFINE_PER_CPU(bool, crypto_simd_disabled_for_ <<
28 EXPORT_PER_CPU_SYMBOL_GPL(crypto_simd_disabled <<
29 #endif <<
30 <<
31 static inline void crypto_check_module_sig(str 24 static inline void crypto_check_module_sig(struct module *mod)
32 { 25 {
33 if (fips_enabled && mod && !module_sig 26 if (fips_enabled && mod && !module_sig_ok(mod))
34 panic("Module %s signature ver 27 panic("Module %s signature verification failed in FIPS mode\n",
35 module_name(mod)); 28 module_name(mod));
36 } 29 }
37 30
38 static int crypto_check_alg(struct crypto_alg 31 static int crypto_check_alg(struct crypto_alg *alg)
39 { 32 {
40 crypto_check_module_sig(alg->cra_modul 33 crypto_check_module_sig(alg->cra_module);
41 34
42 if (!alg->cra_name[0] || !alg->cra_dri 35 if (!alg->cra_name[0] || !alg->cra_driver_name[0])
43 return -EINVAL; 36 return -EINVAL;
44 37
45 if (alg->cra_alignmask & (alg->cra_ali 38 if (alg->cra_alignmask & (alg->cra_alignmask + 1))
46 return -EINVAL; 39 return -EINVAL;
47 40
48 /* General maximums for all algs. */ 41 /* General maximums for all algs. */
49 if (alg->cra_alignmask > MAX_ALGAPI_AL 42 if (alg->cra_alignmask > MAX_ALGAPI_ALIGNMASK)
50 return -EINVAL; 43 return -EINVAL;
51 44
52 if (alg->cra_blocksize > MAX_ALGAPI_BL 45 if (alg->cra_blocksize > MAX_ALGAPI_BLOCKSIZE)
53 return -EINVAL; 46 return -EINVAL;
54 47
55 /* Lower maximums for specific alg typ 48 /* Lower maximums for specific alg types. */
56 if (!alg->cra_type && (alg->cra_flags 49 if (!alg->cra_type && (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
57 CRYPTO_ALG_TYPE 50 CRYPTO_ALG_TYPE_CIPHER) {
58 if (alg->cra_alignmask > MAX_C 51 if (alg->cra_alignmask > MAX_CIPHER_ALIGNMASK)
59 return -EINVAL; 52 return -EINVAL;
60 53
61 if (alg->cra_blocksize > MAX_C 54 if (alg->cra_blocksize > MAX_CIPHER_BLOCKSIZE)
62 return -EINVAL; 55 return -EINVAL;
63 } 56 }
64 57
65 if (alg->cra_priority < 0) 58 if (alg->cra_priority < 0)
66 return -EINVAL; 59 return -EINVAL;
67 60
68 refcount_set(&alg->cra_refcnt, 1); 61 refcount_set(&alg->cra_refcnt, 1);
69 62
70 return 0; 63 return 0;
71 } 64 }
72 65
73 static void crypto_free_instance(struct crypto 66 static void crypto_free_instance(struct crypto_instance *inst)
74 { 67 {
75 inst->alg.cra_type->free(inst); 68 inst->alg.cra_type->free(inst);
76 } 69 }
77 70
78 static void crypto_destroy_instance_workfn(str !! 71 static void crypto_destroy_instance(struct crypto_alg *alg)
79 { 72 {
80 struct crypto_instance *inst = contain !! 73 struct crypto_instance *inst = (void *)alg;
81 <<
82 struct crypto_template *tmpl = inst->t 74 struct crypto_template *tmpl = inst->tmpl;
83 75
84 crypto_free_instance(inst); 76 crypto_free_instance(inst);
85 crypto_tmpl_put(tmpl); 77 crypto_tmpl_put(tmpl);
86 } 78 }
87 79
88 static void crypto_destroy_instance(struct cry <<
89 { <<
90 struct crypto_instance *inst = contain <<
91 <<
92 <<
93 <<
94 INIT_WORK(&inst->free_work, crypto_des <<
95 schedule_work(&inst->free_work); <<
96 } <<
97 <<
98 /* 80 /*
99 * This function adds a spawn to the list seco 81 * This function adds a spawn to the list secondary_spawns which
100 * will be used at the end of crypto_remove_sp 82 * will be used at the end of crypto_remove_spawns to unregister
101 * instances, unless the spawn happens to be o 83 * instances, unless the spawn happens to be one that is depended
102 * on by the new algorithm (nalg in crypto_rem 84 * on by the new algorithm (nalg in crypto_remove_spawns).
103 * 85 *
104 * This function is also responsible for resur 86 * This function is also responsible for resurrecting any algorithms
105 * in the dependency chain of nalg by unsettin 87 * in the dependency chain of nalg by unsetting n->dead.
106 */ 88 */
107 static struct list_head *crypto_more_spawns(st 89 static struct list_head *crypto_more_spawns(struct crypto_alg *alg,
108 st 90 struct list_head *stack,
109 st 91 struct list_head *top,
110 st 92 struct list_head *secondary_spawns)
111 { 93 {
112 struct crypto_spawn *spawn, *n; 94 struct crypto_spawn *spawn, *n;
113 95
114 spawn = list_first_entry_or_null(stack 96 spawn = list_first_entry_or_null(stack, struct crypto_spawn, list);
115 if (!spawn) 97 if (!spawn)
116 return NULL; 98 return NULL;
117 99
118 n = list_prev_entry(spawn, list); 100 n = list_prev_entry(spawn, list);
119 list_move(&spawn->list, secondary_spaw 101 list_move(&spawn->list, secondary_spawns);
120 102
121 if (list_is_last(&n->list, stack)) 103 if (list_is_last(&n->list, stack))
122 return top; 104 return top;
123 105
124 n = list_next_entry(n, list); 106 n = list_next_entry(n, list);
125 if (!spawn->dead) 107 if (!spawn->dead)
126 n->dead = false; 108 n->dead = false;
127 109
128 return &n->inst->alg.cra_users; 110 return &n->inst->alg.cra_users;
129 } 111 }
130 112
131 static void crypto_remove_instance(struct cryp 113 static void crypto_remove_instance(struct crypto_instance *inst,
132 struct list 114 struct list_head *list)
133 { 115 {
134 struct crypto_template *tmpl = inst->t 116 struct crypto_template *tmpl = inst->tmpl;
135 117
136 if (crypto_is_dead(&inst->alg)) 118 if (crypto_is_dead(&inst->alg))
137 return; 119 return;
138 120
139 inst->alg.cra_flags |= CRYPTO_ALG_DEAD 121 inst->alg.cra_flags |= CRYPTO_ALG_DEAD;
140 122
141 if (!tmpl || !crypto_tmpl_get(tmpl)) 123 if (!tmpl || !crypto_tmpl_get(tmpl))
142 return; 124 return;
143 125
144 list_move(&inst->alg.cra_list, list); 126 list_move(&inst->alg.cra_list, list);
145 hlist_del(&inst->list); 127 hlist_del(&inst->list);
146 inst->alg.cra_destroy = crypto_destroy 128 inst->alg.cra_destroy = crypto_destroy_instance;
147 129
148 BUG_ON(!list_empty(&inst->alg.cra_user 130 BUG_ON(!list_empty(&inst->alg.cra_users));
149 } 131 }
150 132
151 /* 133 /*
152 * Given an algorithm alg, remove all algorith 134 * Given an algorithm alg, remove all algorithms that depend on it
153 * through spawns. If nalg is not null, then 135 * through spawns. If nalg is not null, then exempt any algorithms
154 * that is depended on by nalg. This is usefu 136 * that is depended on by nalg. This is useful when nalg itself
155 * depends on alg. 137 * depends on alg.
156 */ 138 */
157 void crypto_remove_spawns(struct crypto_alg *a 139 void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list,
158 struct crypto_alg *n 140 struct crypto_alg *nalg)
159 { 141 {
160 u32 new_type = (nalg ?: alg)->cra_flag 142 u32 new_type = (nalg ?: alg)->cra_flags;
161 struct crypto_spawn *spawn, *n; 143 struct crypto_spawn *spawn, *n;
162 LIST_HEAD(secondary_spawns); 144 LIST_HEAD(secondary_spawns);
163 struct list_head *spawns; 145 struct list_head *spawns;
164 LIST_HEAD(stack); 146 LIST_HEAD(stack);
165 LIST_HEAD(top); 147 LIST_HEAD(top);
166 148
167 spawns = &alg->cra_users; 149 spawns = &alg->cra_users;
168 list_for_each_entry_safe(spawn, n, spa 150 list_for_each_entry_safe(spawn, n, spawns, list) {
169 if ((spawn->alg->cra_flags ^ n 151 if ((spawn->alg->cra_flags ^ new_type) & spawn->mask)
170 continue; 152 continue;
171 153
172 list_move(&spawn->list, &top); 154 list_move(&spawn->list, &top);
173 } 155 }
174 156
175 /* 157 /*
176 * Perform a depth-first walk starting 158 * Perform a depth-first walk starting from alg through
177 * the cra_users tree. The list stack 159 * the cra_users tree. The list stack records the path
178 * from alg to the current spawn. 160 * from alg to the current spawn.
179 */ 161 */
180 spawns = ⊤ 162 spawns = ⊤
181 do { 163 do {
182 while (!list_empty(spawns)) { 164 while (!list_empty(spawns)) {
183 struct crypto_instance 165 struct crypto_instance *inst;
184 166
185 spawn = list_first_ent 167 spawn = list_first_entry(spawns, struct crypto_spawn,
186 168 list);
187 inst = spawn->inst; 169 inst = spawn->inst;
188 170
189 list_move(&spawn->list 171 list_move(&spawn->list, &stack);
190 spawn->dead = !spawn-> 172 spawn->dead = !spawn->registered || &inst->alg != nalg;
191 173
192 if (!spawn->registered 174 if (!spawn->registered)
193 break; 175 break;
194 176
195 BUG_ON(&inst->alg == a 177 BUG_ON(&inst->alg == alg);
196 178
197 if (&inst->alg == nalg 179 if (&inst->alg == nalg)
198 break; 180 break;
199 181
200 spawns = &inst->alg.cr 182 spawns = &inst->alg.cra_users;
201 183
202 /* 184 /*
203 * Even if spawn->regi 185 * Even if spawn->registered is true, the
204 * instance itself may 186 * instance itself may still be unregistered.
205 * This is because it 187 * This is because it may have failed during
206 * registration. Ther 188 * registration. Therefore we still need to
207 * make the following 189 * make the following test.
208 * 190 *
209 * We may encounter an 191 * We may encounter an unregistered instance here, since
210 * an instance's spawn 192 * an instance's spawns are set up prior to the instance
211 * being registered. 193 * being registered. An unregistered instance will have
212 * NULL ->cra_users.ne 194 * NULL ->cra_users.next, since ->cra_users isn't
213 * properly initialize 195 * properly initialized until registration. But an
214 * unregistered instan 196 * unregistered instance cannot have any users, so treat
215 * it the same as ->cr 197 * it the same as ->cra_users being empty.
216 */ 198 */
217 if (spawns->next == NU 199 if (spawns->next == NULL)
218 break; 200 break;
219 } 201 }
220 } while ((spawns = crypto_more_spawns( 202 } while ((spawns = crypto_more_spawns(alg, &stack, &top,
221 203 &secondary_spawns)));
222 204
223 /* 205 /*
224 * Remove all instances that are marke 206 * Remove all instances that are marked as dead. Also
225 * complete the resurrection of the ot 207 * complete the resurrection of the others by moving them
226 * back to the cra_users list. 208 * back to the cra_users list.
227 */ 209 */
228 list_for_each_entry_safe(spawn, n, &se 210 list_for_each_entry_safe(spawn, n, &secondary_spawns, list) {
229 if (!spawn->dead) 211 if (!spawn->dead)
230 list_move(&spawn->list 212 list_move(&spawn->list, &spawn->alg->cra_users);
231 else if (spawn->registered) 213 else if (spawn->registered)
232 crypto_remove_instance 214 crypto_remove_instance(spawn->inst, list);
233 } 215 }
234 } 216 }
235 EXPORT_SYMBOL_GPL(crypto_remove_spawns); 217 EXPORT_SYMBOL_GPL(crypto_remove_spawns);
236 218
237 static void crypto_alg_finish_registration(str <<
238 boo <<
239 str <<
240 { <<
241 struct crypto_alg *q; <<
242 <<
243 list_for_each_entry(q, &crypto_alg_lis <<
244 if (q == alg) <<
245 continue; <<
246 <<
247 if (crypto_is_moribund(q)) <<
248 continue; <<
249 <<
250 if (crypto_is_larval(q)) { <<
251 struct crypto_larval * <<
252 <<
253 /* <<
254 * Check to see if eit <<
255 * specific name can s <<
256 * by the larval entry <<
257 */ <<
258 if (strcmp(alg->cra_na <<
259 strcmp(alg->cra_dr <<
260 continue; <<
261 <<
262 if (larval->adult) <<
263 continue; <<
264 if ((q->cra_flags ^ al <<
265 continue; <<
266 <<
267 if (fulfill_requests & <<
268 larval->adult <<
269 else <<
270 larval->adult <<
271 <<
272 continue; <<
273 } <<
274 <<
275 if (strcmp(alg->cra_name, q->c <<
276 continue; <<
277 <<
278 if (strcmp(alg->cra_driver_nam <<
279 q->cra_priority > alg->cra <<
280 continue; <<
281 <<
282 crypto_remove_spawns(q, algs_t <<
283 } <<
284 <<
285 crypto_notify(CRYPTO_MSG_ALG_LOADED, a <<
286 } <<
287 <<
288 static struct crypto_larval *crypto_alloc_test 219 static struct crypto_larval *crypto_alloc_test_larval(struct crypto_alg *alg)
289 { 220 {
290 struct crypto_larval *larval; 221 struct crypto_larval *larval;
291 222
292 if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER) !! 223 if (!IS_ENABLED(CONFIG_CRYPTO_MANAGER))
293 IS_ENABLED(CONFIG_CRYPTO_MANAGER_D !! 224 return NULL;
294 (alg->cra_flags & CRYPTO_ALG_INTER <<
295 return NULL; /* No self-test n <<
296 225
297 larval = crypto_larval_alloc(alg->cra_ 226 larval = crypto_larval_alloc(alg->cra_name,
298 alg->cra_ 227 alg->cra_flags | CRYPTO_ALG_TESTED, 0);
299 if (IS_ERR(larval)) 228 if (IS_ERR(larval))
300 return larval; 229 return larval;
301 230
302 larval->adult = crypto_mod_get(alg); 231 larval->adult = crypto_mod_get(alg);
303 if (!larval->adult) { 232 if (!larval->adult) {
304 kfree(larval); 233 kfree(larval);
305 return ERR_PTR(-ENOENT); 234 return ERR_PTR(-ENOENT);
306 } 235 }
307 236
308 refcount_set(&larval->alg.cra_refcnt, 237 refcount_set(&larval->alg.cra_refcnt, 1);
309 memcpy(larval->alg.cra_driver_name, al 238 memcpy(larval->alg.cra_driver_name, alg->cra_driver_name,
310 CRYPTO_MAX_ALG_NAME); 239 CRYPTO_MAX_ALG_NAME);
311 larval->alg.cra_priority = alg->cra_pr 240 larval->alg.cra_priority = alg->cra_priority;
312 241
313 return larval; 242 return larval;
314 } 243 }
315 244
316 static struct crypto_larval * !! 245 static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)
317 __crypto_register_alg(struct crypto_alg *alg, <<
318 { 246 {
319 struct crypto_alg *q; 247 struct crypto_alg *q;
320 struct crypto_larval *larval; 248 struct crypto_larval *larval;
321 int ret = -EAGAIN; 249 int ret = -EAGAIN;
322 250
323 if (crypto_is_dead(alg)) 251 if (crypto_is_dead(alg))
324 goto err; 252 goto err;
325 253
326 INIT_LIST_HEAD(&alg->cra_users); 254 INIT_LIST_HEAD(&alg->cra_users);
327 255
>> 256 /* No cheating! */
>> 257 alg->cra_flags &= ~CRYPTO_ALG_TESTED;
>> 258
328 ret = -EEXIST; 259 ret = -EEXIST;
329 260
330 list_for_each_entry(q, &crypto_alg_lis 261 list_for_each_entry(q, &crypto_alg_list, cra_list) {
331 if (q == alg) 262 if (q == alg)
332 goto err; 263 goto err;
333 264
334 if (crypto_is_moribund(q)) 265 if (crypto_is_moribund(q))
335 continue; 266 continue;
336 267
337 if (crypto_is_larval(q)) { 268 if (crypto_is_larval(q)) {
338 if (!strcmp(alg->cra_d 269 if (!strcmp(alg->cra_driver_name, q->cra_driver_name))
339 goto err; 270 goto err;
340 continue; 271 continue;
341 } 272 }
342 273
343 if (!strcmp(q->cra_driver_name 274 if (!strcmp(q->cra_driver_name, alg->cra_name) ||
344 !strcmp(q->cra_driver_name <<
345 !strcmp(q->cra_name, alg-> 275 !strcmp(q->cra_name, alg->cra_driver_name))
346 goto err; 276 goto err;
347 } 277 }
348 278
349 larval = crypto_alloc_test_larval(alg) 279 larval = crypto_alloc_test_larval(alg);
350 if (IS_ERR(larval)) 280 if (IS_ERR(larval))
351 goto out; 281 goto out;
352 282
353 list_add(&alg->cra_list, &crypto_alg_l 283 list_add(&alg->cra_list, &crypto_alg_list);
354 284
355 if (larval) { !! 285 if (larval)
356 /* No cheating! */ <<
357 alg->cra_flags &= ~CRYPTO_ALG_ <<
358 <<
359 list_add(&larval->alg.cra_list 286 list_add(&larval->alg.cra_list, &crypto_alg_list);
360 } else { !! 287 else
361 alg->cra_flags |= CRYPTO_ALG_T 288 alg->cra_flags |= CRYPTO_ALG_TESTED;
362 crypto_alg_finish_registration !! 289
363 } !! 290 crypto_stats_init(alg);
364 291
365 out: 292 out:
366 return larval; 293 return larval;
367 294
368 err: 295 err:
369 larval = ERR_PTR(ret); 296 larval = ERR_PTR(ret);
370 goto out; 297 goto out;
371 } 298 }
372 299
373 void crypto_alg_tested(const char *name, int e 300 void crypto_alg_tested(const char *name, int err)
374 { 301 {
375 struct crypto_larval *test; 302 struct crypto_larval *test;
376 struct crypto_alg *alg; 303 struct crypto_alg *alg;
377 struct crypto_alg *q; 304 struct crypto_alg *q;
378 LIST_HEAD(list); 305 LIST_HEAD(list);
379 bool best; 306 bool best;
380 307
381 down_write(&crypto_alg_sem); 308 down_write(&crypto_alg_sem);
382 list_for_each_entry(q, &crypto_alg_lis 309 list_for_each_entry(q, &crypto_alg_list, cra_list) {
383 if (crypto_is_moribund(q) || ! 310 if (crypto_is_moribund(q) || !crypto_is_larval(q))
384 continue; 311 continue;
385 312
386 test = (struct crypto_larval * 313 test = (struct crypto_larval *)q;
387 314
388 if (!strcmp(q->cra_driver_name 315 if (!strcmp(q->cra_driver_name, name))
389 goto found; 316 goto found;
390 } 317 }
391 318
392 pr_err("alg: Unexpected test result fo 319 pr_err("alg: Unexpected test result for %s: %d\n", name, err);
393 goto unlock; 320 goto unlock;
394 321
395 found: 322 found:
396 q->cra_flags |= CRYPTO_ALG_DEAD; 323 q->cra_flags |= CRYPTO_ALG_DEAD;
397 alg = test->adult; 324 alg = test->adult;
398 !! 325 if (err || list_empty(&alg->cra_list))
399 if (list_empty(&alg->cra_list)) <<
400 goto complete; <<
401 <<
402 if (err == -ECANCELED) <<
403 alg->cra_flags |= CRYPTO_ALG_F <<
404 else if (err) <<
405 goto complete; 326 goto complete;
406 else <<
407 alg->cra_flags &= ~CRYPTO_ALG_ <<
408 327
409 alg->cra_flags |= CRYPTO_ALG_TESTED; 328 alg->cra_flags |= CRYPTO_ALG_TESTED;
410 329
411 /* !! 330 /* Only satisfy larval waiters if we are the best. */
412 * If a higher-priority implementation <<
413 * currently being tested, then don't <<
414 */ <<
415 best = true; 331 best = true;
416 list_for_each_entry(q, &crypto_alg_lis 332 list_for_each_entry(q, &crypto_alg_list, cra_list) {
417 if (crypto_is_moribund(q) || ! 333 if (crypto_is_moribund(q) || !crypto_is_larval(q))
418 continue; 334 continue;
419 335
420 if (strcmp(alg->cra_name, q->c 336 if (strcmp(alg->cra_name, q->cra_name))
421 continue; 337 continue;
422 338
423 if (q->cra_priority > alg->cra 339 if (q->cra_priority > alg->cra_priority) {
424 best = false; 340 best = false;
425 break; 341 break;
426 } 342 }
427 } 343 }
428 344
429 crypto_alg_finish_registration(alg, be !! 345 list_for_each_entry(q, &crypto_alg_list, cra_list) {
>> 346 if (q == alg)
>> 347 continue;
>> 348
>> 349 if (crypto_is_moribund(q))
>> 350 continue;
>> 351
>> 352 if (crypto_is_larval(q)) {
>> 353 struct crypto_larval *larval = (void *)q;
>> 354
>> 355 /*
>> 356 * Check to see if either our generic name or
>> 357 * specific name can satisfy the name requested
>> 358 * by the larval entry q.
>> 359 */
>> 360 if (strcmp(alg->cra_name, q->cra_name) &&
>> 361 strcmp(alg->cra_driver_name, q->cra_name))
>> 362 continue;
>> 363
>> 364 if (larval->adult)
>> 365 continue;
>> 366 if ((q->cra_flags ^ alg->cra_flags) & larval->mask)
>> 367 continue;
>> 368
>> 369 if (best && crypto_mod_get(alg))
>> 370 larval->adult = alg;
>> 371 else
>> 372 larval->adult = ERR_PTR(-EAGAIN);
>> 373
>> 374 continue;
>> 375 }
>> 376
>> 377 if (strcmp(alg->cra_name, q->cra_name))
>> 378 continue;
>> 379
>> 380 if (strcmp(alg->cra_driver_name, q->cra_driver_name) &&
>> 381 q->cra_priority > alg->cra_priority)
>> 382 continue;
>> 383
>> 384 crypto_remove_spawns(q, &list, alg);
>> 385 }
430 386
431 complete: 387 complete:
432 complete_all(&test->completion); 388 complete_all(&test->completion);
433 389
434 unlock: 390 unlock:
435 up_write(&crypto_alg_sem); 391 up_write(&crypto_alg_sem);
436 392
437 crypto_remove_final(&list); 393 crypto_remove_final(&list);
438 } 394 }
439 EXPORT_SYMBOL_GPL(crypto_alg_tested); 395 EXPORT_SYMBOL_GPL(crypto_alg_tested);
440 396
441 void crypto_remove_final(struct list_head *lis 397 void crypto_remove_final(struct list_head *list)
442 { 398 {
443 struct crypto_alg *alg; 399 struct crypto_alg *alg;
444 struct crypto_alg *n; 400 struct crypto_alg *n;
445 401
446 list_for_each_entry_safe(alg, n, list, 402 list_for_each_entry_safe(alg, n, list, cra_list) {
447 list_del_init(&alg->cra_list); 403 list_del_init(&alg->cra_list);
448 crypto_alg_put(alg); 404 crypto_alg_put(alg);
449 } 405 }
450 } 406 }
451 EXPORT_SYMBOL_GPL(crypto_remove_final); 407 EXPORT_SYMBOL_GPL(crypto_remove_final);
452 408
453 int crypto_register_alg(struct crypto_alg *alg 409 int crypto_register_alg(struct crypto_alg *alg)
454 { 410 {
455 struct crypto_larval *larval; 411 struct crypto_larval *larval;
456 LIST_HEAD(algs_to_put); !! 412 bool test_started;
457 bool test_started = false; <<
458 int err; 413 int err;
459 414
460 alg->cra_flags &= ~CRYPTO_ALG_DEAD; 415 alg->cra_flags &= ~CRYPTO_ALG_DEAD;
461 err = crypto_check_alg(alg); 416 err = crypto_check_alg(alg);
462 if (err) 417 if (err)
463 return err; 418 return err;
464 419
465 down_write(&crypto_alg_sem); 420 down_write(&crypto_alg_sem);
466 larval = __crypto_register_alg(alg, &a !! 421 larval = __crypto_register_alg(alg);
467 if (!IS_ERR_OR_NULL(larval)) { !! 422 test_started = static_key_enabled(&crypto_boot_test_finished);
468 test_started = crypto_boot_tes !! 423 if (!IS_ERR_OR_NULL(larval))
469 larval->test_started = test_st 424 larval->test_started = test_started;
470 } <<
471 up_write(&crypto_alg_sem); 425 up_write(&crypto_alg_sem);
472 426
473 if (IS_ERR(larval)) !! 427 if (IS_ERR_OR_NULL(larval))
474 return PTR_ERR(larval); 428 return PTR_ERR(larval);
>> 429
475 if (test_started) 430 if (test_started)
476 crypto_wait_for_test(larval); 431 crypto_wait_for_test(larval);
477 crypto_remove_final(&algs_to_put); <<
478 return 0; 432 return 0;
479 } 433 }
480 EXPORT_SYMBOL_GPL(crypto_register_alg); 434 EXPORT_SYMBOL_GPL(crypto_register_alg);
481 435
482 static int crypto_remove_alg(struct crypto_alg 436 static int crypto_remove_alg(struct crypto_alg *alg, struct list_head *list)
483 { 437 {
484 if (unlikely(list_empty(&alg->cra_list 438 if (unlikely(list_empty(&alg->cra_list)))
485 return -ENOENT; 439 return -ENOENT;
486 440
487 alg->cra_flags |= CRYPTO_ALG_DEAD; 441 alg->cra_flags |= CRYPTO_ALG_DEAD;
488 442
489 list_del_init(&alg->cra_list); 443 list_del_init(&alg->cra_list);
490 crypto_remove_spawns(alg, list, NULL); 444 crypto_remove_spawns(alg, list, NULL);
491 445
492 return 0; 446 return 0;
493 } 447 }
494 448
495 void crypto_unregister_alg(struct crypto_alg * 449 void crypto_unregister_alg(struct crypto_alg *alg)
496 { 450 {
497 int ret; 451 int ret;
498 LIST_HEAD(list); 452 LIST_HEAD(list);
499 453
500 down_write(&crypto_alg_sem); 454 down_write(&crypto_alg_sem);
501 ret = crypto_remove_alg(alg, &list); 455 ret = crypto_remove_alg(alg, &list);
502 up_write(&crypto_alg_sem); 456 up_write(&crypto_alg_sem);
503 457
504 if (WARN(ret, "Algorithm %s is not reg 458 if (WARN(ret, "Algorithm %s is not registered", alg->cra_driver_name))
505 return; 459 return;
506 460
507 if (WARN_ON(refcount_read(&alg->cra_re !! 461 BUG_ON(refcount_read(&alg->cra_refcnt) != 1);
508 return; <<
509 <<
510 if (alg->cra_destroy) 462 if (alg->cra_destroy)
511 alg->cra_destroy(alg); 463 alg->cra_destroy(alg);
512 464
513 crypto_remove_final(&list); 465 crypto_remove_final(&list);
514 } 466 }
515 EXPORT_SYMBOL_GPL(crypto_unregister_alg); 467 EXPORT_SYMBOL_GPL(crypto_unregister_alg);
516 468
517 int crypto_register_algs(struct crypto_alg *al 469 int crypto_register_algs(struct crypto_alg *algs, int count)
518 { 470 {
519 int i, ret; 471 int i, ret;
520 472
521 for (i = 0; i < count; i++) { 473 for (i = 0; i < count; i++) {
522 ret = crypto_register_alg(&alg 474 ret = crypto_register_alg(&algs[i]);
523 if (ret) 475 if (ret)
524 goto err; 476 goto err;
525 } 477 }
526 478
527 return 0; 479 return 0;
528 480
529 err: 481 err:
530 for (--i; i >= 0; --i) 482 for (--i; i >= 0; --i)
531 crypto_unregister_alg(&algs[i] 483 crypto_unregister_alg(&algs[i]);
532 484
533 return ret; 485 return ret;
534 } 486 }
535 EXPORT_SYMBOL_GPL(crypto_register_algs); 487 EXPORT_SYMBOL_GPL(crypto_register_algs);
536 488
537 void crypto_unregister_algs(struct crypto_alg 489 void crypto_unregister_algs(struct crypto_alg *algs, int count)
538 { 490 {
539 int i; 491 int i;
540 492
541 for (i = 0; i < count; i++) 493 for (i = 0; i < count; i++)
542 crypto_unregister_alg(&algs[i] 494 crypto_unregister_alg(&algs[i]);
543 } 495 }
544 EXPORT_SYMBOL_GPL(crypto_unregister_algs); 496 EXPORT_SYMBOL_GPL(crypto_unregister_algs);
545 497
546 int crypto_register_template(struct crypto_tem 498 int crypto_register_template(struct crypto_template *tmpl)
547 { 499 {
548 struct crypto_template *q; 500 struct crypto_template *q;
549 int err = -EEXIST; 501 int err = -EEXIST;
550 502
551 down_write(&crypto_alg_sem); 503 down_write(&crypto_alg_sem);
552 504
553 crypto_check_module_sig(tmpl->module); 505 crypto_check_module_sig(tmpl->module);
554 506
555 list_for_each_entry(q, &crypto_templat 507 list_for_each_entry(q, &crypto_template_list, list) {
556 if (q == tmpl) 508 if (q == tmpl)
557 goto out; 509 goto out;
558 } 510 }
559 511
560 list_add(&tmpl->list, &crypto_template 512 list_add(&tmpl->list, &crypto_template_list);
561 err = 0; 513 err = 0;
562 out: 514 out:
563 up_write(&crypto_alg_sem); 515 up_write(&crypto_alg_sem);
564 return err; 516 return err;
565 } 517 }
566 EXPORT_SYMBOL_GPL(crypto_register_template); 518 EXPORT_SYMBOL_GPL(crypto_register_template);
567 519
568 int crypto_register_templates(struct crypto_te 520 int crypto_register_templates(struct crypto_template *tmpls, int count)
569 { 521 {
570 int i, err; 522 int i, err;
571 523
572 for (i = 0; i < count; i++) { 524 for (i = 0; i < count; i++) {
573 err = crypto_register_template 525 err = crypto_register_template(&tmpls[i]);
574 if (err) 526 if (err)
575 goto out; 527 goto out;
576 } 528 }
577 return 0; 529 return 0;
578 530
579 out: 531 out:
580 for (--i; i >= 0; --i) 532 for (--i; i >= 0; --i)
581 crypto_unregister_template(&tm 533 crypto_unregister_template(&tmpls[i]);
582 return err; 534 return err;
583 } 535 }
584 EXPORT_SYMBOL_GPL(crypto_register_templates); 536 EXPORT_SYMBOL_GPL(crypto_register_templates);
585 537
586 void crypto_unregister_template(struct crypto_ 538 void crypto_unregister_template(struct crypto_template *tmpl)
587 { 539 {
588 struct crypto_instance *inst; 540 struct crypto_instance *inst;
589 struct hlist_node *n; 541 struct hlist_node *n;
590 struct hlist_head *list; 542 struct hlist_head *list;
591 LIST_HEAD(users); 543 LIST_HEAD(users);
592 544
593 down_write(&crypto_alg_sem); 545 down_write(&crypto_alg_sem);
594 546
595 BUG_ON(list_empty(&tmpl->list)); 547 BUG_ON(list_empty(&tmpl->list));
596 list_del_init(&tmpl->list); 548 list_del_init(&tmpl->list);
597 549
598 list = &tmpl->instances; 550 list = &tmpl->instances;
599 hlist_for_each_entry(inst, list, list) 551 hlist_for_each_entry(inst, list, list) {
600 int err = crypto_remove_alg(&i 552 int err = crypto_remove_alg(&inst->alg, &users);
601 553
602 BUG_ON(err); 554 BUG_ON(err);
603 } 555 }
604 556
605 up_write(&crypto_alg_sem); 557 up_write(&crypto_alg_sem);
606 558
607 hlist_for_each_entry_safe(inst, n, lis 559 hlist_for_each_entry_safe(inst, n, list, list) {
608 BUG_ON(refcount_read(&inst->al 560 BUG_ON(refcount_read(&inst->alg.cra_refcnt) != 1);
609 crypto_free_instance(inst); 561 crypto_free_instance(inst);
610 } 562 }
611 crypto_remove_final(&users); 563 crypto_remove_final(&users);
612 } 564 }
613 EXPORT_SYMBOL_GPL(crypto_unregister_template); 565 EXPORT_SYMBOL_GPL(crypto_unregister_template);
614 566
615 void crypto_unregister_templates(struct crypto 567 void crypto_unregister_templates(struct crypto_template *tmpls, int count)
616 { 568 {
617 int i; 569 int i;
618 570
619 for (i = count - 1; i >= 0; --i) 571 for (i = count - 1; i >= 0; --i)
620 crypto_unregister_template(&tm 572 crypto_unregister_template(&tmpls[i]);
621 } 573 }
622 EXPORT_SYMBOL_GPL(crypto_unregister_templates) 574 EXPORT_SYMBOL_GPL(crypto_unregister_templates);
623 575
624 static struct crypto_template *__crypto_lookup 576 static struct crypto_template *__crypto_lookup_template(const char *name)
625 { 577 {
626 struct crypto_template *q, *tmpl = NUL 578 struct crypto_template *q, *tmpl = NULL;
627 579
628 down_read(&crypto_alg_sem); 580 down_read(&crypto_alg_sem);
629 list_for_each_entry(q, &crypto_templat 581 list_for_each_entry(q, &crypto_template_list, list) {
630 if (strcmp(q->name, name)) 582 if (strcmp(q->name, name))
631 continue; 583 continue;
632 if (unlikely(!crypto_tmpl_get( 584 if (unlikely(!crypto_tmpl_get(q)))
633 continue; 585 continue;
634 586
635 tmpl = q; 587 tmpl = q;
636 break; 588 break;
637 } 589 }
638 up_read(&crypto_alg_sem); 590 up_read(&crypto_alg_sem);
639 591
640 return tmpl; 592 return tmpl;
641 } 593 }
642 594
643 struct crypto_template *crypto_lookup_template 595 struct crypto_template *crypto_lookup_template(const char *name)
644 { 596 {
645 return try_then_request_module(__crypt 597 return try_then_request_module(__crypto_lookup_template(name),
646 "crypto 598 "crypto-%s", name);
647 } 599 }
648 EXPORT_SYMBOL_GPL(crypto_lookup_template); 600 EXPORT_SYMBOL_GPL(crypto_lookup_template);
649 601
650 int crypto_register_instance(struct crypto_tem 602 int crypto_register_instance(struct crypto_template *tmpl,
651 struct crypto_ins 603 struct crypto_instance *inst)
652 { 604 {
653 struct crypto_larval *larval; 605 struct crypto_larval *larval;
654 struct crypto_spawn *spawn; 606 struct crypto_spawn *spawn;
655 u32 fips_internal = 0; <<
656 LIST_HEAD(algs_to_put); <<
657 int err; 607 int err;
658 608
659 err = crypto_check_alg(&inst->alg); 609 err = crypto_check_alg(&inst->alg);
660 if (err) 610 if (err)
661 return err; 611 return err;
662 612
663 inst->alg.cra_module = tmpl->module; 613 inst->alg.cra_module = tmpl->module;
664 inst->alg.cra_flags |= CRYPTO_ALG_INST 614 inst->alg.cra_flags |= CRYPTO_ALG_INSTANCE;
665 615
666 down_write(&crypto_alg_sem); 616 down_write(&crypto_alg_sem);
667 617
668 larval = ERR_PTR(-EAGAIN); 618 larval = ERR_PTR(-EAGAIN);
669 for (spawn = inst->spawns; spawn;) { 619 for (spawn = inst->spawns; spawn;) {
670 struct crypto_spawn *next; 620 struct crypto_spawn *next;
671 621
672 if (spawn->dead) 622 if (spawn->dead)
673 goto unlock; 623 goto unlock;
674 624
675 next = spawn->next; 625 next = spawn->next;
676 spawn->inst = inst; 626 spawn->inst = inst;
677 spawn->registered = true; 627 spawn->registered = true;
678 628
679 fips_internal |= spawn->alg->c <<
680 <<
681 crypto_mod_put(spawn->alg); 629 crypto_mod_put(spawn->alg);
682 630
683 spawn = next; 631 spawn = next;
684 } 632 }
685 633
686 inst->alg.cra_flags |= (fips_internal !! 634 larval = __crypto_register_alg(&inst->alg);
687 <<
688 larval = __crypto_register_alg(&inst-> <<
689 if (IS_ERR(larval)) 635 if (IS_ERR(larval))
690 goto unlock; 636 goto unlock;
691 else if (larval) 637 else if (larval)
692 larval->test_started = true; 638 larval->test_started = true;
693 639
694 hlist_add_head(&inst->list, &tmpl->ins 640 hlist_add_head(&inst->list, &tmpl->instances);
695 inst->tmpl = tmpl; 641 inst->tmpl = tmpl;
696 642
697 unlock: 643 unlock:
698 up_write(&crypto_alg_sem); 644 up_write(&crypto_alg_sem);
699 645
700 if (IS_ERR(larval)) !! 646 err = PTR_ERR(larval);
701 return PTR_ERR(larval); !! 647 if (IS_ERR_OR_NULL(larval))
702 if (larval) !! 648 goto err;
703 crypto_wait_for_test(larval); !! 649
704 crypto_remove_final(&algs_to_put); !! 650 crypto_wait_for_test(larval);
705 return 0; !! 651 err = 0;
>> 652
>> 653 err:
>> 654 return err;
706 } 655 }
707 EXPORT_SYMBOL_GPL(crypto_register_instance); 656 EXPORT_SYMBOL_GPL(crypto_register_instance);
708 657
709 void crypto_unregister_instance(struct crypto_ 658 void crypto_unregister_instance(struct crypto_instance *inst)
710 { 659 {
711 LIST_HEAD(list); 660 LIST_HEAD(list);
712 661
713 down_write(&crypto_alg_sem); 662 down_write(&crypto_alg_sem);
714 663
715 crypto_remove_spawns(&inst->alg, &list 664 crypto_remove_spawns(&inst->alg, &list, NULL);
716 crypto_remove_instance(inst, &list); 665 crypto_remove_instance(inst, &list);
717 666
718 up_write(&crypto_alg_sem); 667 up_write(&crypto_alg_sem);
719 668
720 crypto_remove_final(&list); 669 crypto_remove_final(&list);
721 } 670 }
722 EXPORT_SYMBOL_GPL(crypto_unregister_instance); 671 EXPORT_SYMBOL_GPL(crypto_unregister_instance);
723 672
724 int crypto_grab_spawn(struct crypto_spawn *spa 673 int crypto_grab_spawn(struct crypto_spawn *spawn, struct crypto_instance *inst,
725 const char *name, u32 ty 674 const char *name, u32 type, u32 mask)
726 { 675 {
727 struct crypto_alg *alg; 676 struct crypto_alg *alg;
728 int err = -EAGAIN; 677 int err = -EAGAIN;
729 678
730 if (WARN_ON_ONCE(inst == NULL)) 679 if (WARN_ON_ONCE(inst == NULL))
731 return -EINVAL; 680 return -EINVAL;
732 681
733 /* Allow the result of crypto_attr_alg 682 /* Allow the result of crypto_attr_alg_name() to be passed directly */
734 if (IS_ERR(name)) 683 if (IS_ERR(name))
735 return PTR_ERR(name); 684 return PTR_ERR(name);
736 685
737 alg = crypto_find_alg(name, spawn->fro !! 686 alg = crypto_find_alg(name, spawn->frontend, type, mask);
738 type | CRYPTO_AL <<
739 if (IS_ERR(alg)) 687 if (IS_ERR(alg))
740 return PTR_ERR(alg); 688 return PTR_ERR(alg);
741 689
742 down_write(&crypto_alg_sem); 690 down_write(&crypto_alg_sem);
743 if (!crypto_is_moribund(alg)) { 691 if (!crypto_is_moribund(alg)) {
744 list_add(&spawn->list, &alg->c 692 list_add(&spawn->list, &alg->cra_users);
745 spawn->alg = alg; 693 spawn->alg = alg;
746 spawn->mask = mask; 694 spawn->mask = mask;
747 spawn->next = inst->spawns; 695 spawn->next = inst->spawns;
748 inst->spawns = spawn; 696 inst->spawns = spawn;
749 inst->alg.cra_flags |= 697 inst->alg.cra_flags |=
750 (alg->cra_flags & CRYP 698 (alg->cra_flags & CRYPTO_ALG_INHERITED_FLAGS);
751 err = 0; 699 err = 0;
752 } 700 }
753 up_write(&crypto_alg_sem); 701 up_write(&crypto_alg_sem);
754 if (err) 702 if (err)
755 crypto_mod_put(alg); 703 crypto_mod_put(alg);
756 return err; 704 return err;
757 } 705 }
758 EXPORT_SYMBOL_GPL(crypto_grab_spawn); 706 EXPORT_SYMBOL_GPL(crypto_grab_spawn);
759 707
760 void crypto_drop_spawn(struct crypto_spawn *sp 708 void crypto_drop_spawn(struct crypto_spawn *spawn)
761 { 709 {
762 if (!spawn->alg) /* not yet initialize 710 if (!spawn->alg) /* not yet initialized? */
763 return; 711 return;
764 712
765 down_write(&crypto_alg_sem); 713 down_write(&crypto_alg_sem);
766 if (!spawn->dead) 714 if (!spawn->dead)
767 list_del(&spawn->list); 715 list_del(&spawn->list);
768 up_write(&crypto_alg_sem); 716 up_write(&crypto_alg_sem);
769 717
770 if (!spawn->registered) 718 if (!spawn->registered)
771 crypto_mod_put(spawn->alg); 719 crypto_mod_put(spawn->alg);
772 } 720 }
773 EXPORT_SYMBOL_GPL(crypto_drop_spawn); 721 EXPORT_SYMBOL_GPL(crypto_drop_spawn);
774 722
775 static struct crypto_alg *crypto_spawn_alg(str 723 static struct crypto_alg *crypto_spawn_alg(struct crypto_spawn *spawn)
776 { 724 {
777 struct crypto_alg *alg = ERR_PTR(-EAGA 725 struct crypto_alg *alg = ERR_PTR(-EAGAIN);
778 struct crypto_alg *target; 726 struct crypto_alg *target;
779 bool shoot = false; 727 bool shoot = false;
780 728
781 down_read(&crypto_alg_sem); 729 down_read(&crypto_alg_sem);
782 if (!spawn->dead) { 730 if (!spawn->dead) {
783 alg = spawn->alg; 731 alg = spawn->alg;
784 if (!crypto_mod_get(alg)) { 732 if (!crypto_mod_get(alg)) {
785 target = crypto_alg_ge 733 target = crypto_alg_get(alg);
786 shoot = true; 734 shoot = true;
787 alg = ERR_PTR(-EAGAIN) 735 alg = ERR_PTR(-EAGAIN);
788 } 736 }
789 } 737 }
790 up_read(&crypto_alg_sem); 738 up_read(&crypto_alg_sem);
791 739
792 if (shoot) { 740 if (shoot) {
793 crypto_shoot_alg(target); 741 crypto_shoot_alg(target);
794 crypto_alg_put(target); 742 crypto_alg_put(target);
795 } 743 }
796 744
797 return alg; 745 return alg;
798 } 746 }
799 747
800 struct crypto_tfm *crypto_spawn_tfm(struct cry 748 struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,
801 u32 mask) 749 u32 mask)
802 { 750 {
803 struct crypto_alg *alg; 751 struct crypto_alg *alg;
804 struct crypto_tfm *tfm; 752 struct crypto_tfm *tfm;
805 753
806 alg = crypto_spawn_alg(spawn); 754 alg = crypto_spawn_alg(spawn);
807 if (IS_ERR(alg)) 755 if (IS_ERR(alg))
808 return ERR_CAST(alg); 756 return ERR_CAST(alg);
809 757
810 tfm = ERR_PTR(-EINVAL); 758 tfm = ERR_PTR(-EINVAL);
811 if (unlikely((alg->cra_flags ^ type) & 759 if (unlikely((alg->cra_flags ^ type) & mask))
812 goto out_put_alg; 760 goto out_put_alg;
813 761
814 tfm = __crypto_alloc_tfm(alg, type, ma 762 tfm = __crypto_alloc_tfm(alg, type, mask);
815 if (IS_ERR(tfm)) 763 if (IS_ERR(tfm))
816 goto out_put_alg; 764 goto out_put_alg;
817 765
818 return tfm; 766 return tfm;
819 767
820 out_put_alg: 768 out_put_alg:
821 crypto_mod_put(alg); 769 crypto_mod_put(alg);
822 return tfm; 770 return tfm;
823 } 771 }
824 EXPORT_SYMBOL_GPL(crypto_spawn_tfm); 772 EXPORT_SYMBOL_GPL(crypto_spawn_tfm);
825 773
826 void *crypto_spawn_tfm2(struct crypto_spawn *s 774 void *crypto_spawn_tfm2(struct crypto_spawn *spawn)
827 { 775 {
828 struct crypto_alg *alg; 776 struct crypto_alg *alg;
829 struct crypto_tfm *tfm; 777 struct crypto_tfm *tfm;
830 778
831 alg = crypto_spawn_alg(spawn); 779 alg = crypto_spawn_alg(spawn);
832 if (IS_ERR(alg)) 780 if (IS_ERR(alg))
833 return ERR_CAST(alg); 781 return ERR_CAST(alg);
834 782
835 tfm = crypto_create_tfm(alg, spawn->fr 783 tfm = crypto_create_tfm(alg, spawn->frontend);
836 if (IS_ERR(tfm)) 784 if (IS_ERR(tfm))
837 goto out_put_alg; 785 goto out_put_alg;
838 786
839 return tfm; 787 return tfm;
840 788
841 out_put_alg: 789 out_put_alg:
842 crypto_mod_put(alg); 790 crypto_mod_put(alg);
843 return tfm; 791 return tfm;
844 } 792 }
845 EXPORT_SYMBOL_GPL(crypto_spawn_tfm2); 793 EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
846 794
847 int crypto_register_notifier(struct notifier_b 795 int crypto_register_notifier(struct notifier_block *nb)
848 { 796 {
849 return blocking_notifier_chain_registe 797 return blocking_notifier_chain_register(&crypto_chain, nb);
850 } 798 }
851 EXPORT_SYMBOL_GPL(crypto_register_notifier); 799 EXPORT_SYMBOL_GPL(crypto_register_notifier);
852 800
853 int crypto_unregister_notifier(struct notifier 801 int crypto_unregister_notifier(struct notifier_block *nb)
854 { 802 {
855 return blocking_notifier_chain_unregis 803 return blocking_notifier_chain_unregister(&crypto_chain, nb);
856 } 804 }
857 EXPORT_SYMBOL_GPL(crypto_unregister_notifier); 805 EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
858 806
859 struct crypto_attr_type *crypto_get_attr_type( 807 struct crypto_attr_type *crypto_get_attr_type(struct rtattr **tb)
860 { 808 {
861 struct rtattr *rta = tb[0]; 809 struct rtattr *rta = tb[0];
862 struct crypto_attr_type *algt; 810 struct crypto_attr_type *algt;
863 811
864 if (!rta) 812 if (!rta)
865 return ERR_PTR(-ENOENT); 813 return ERR_PTR(-ENOENT);
866 if (RTA_PAYLOAD(rta) < sizeof(*algt)) 814 if (RTA_PAYLOAD(rta) < sizeof(*algt))
867 return ERR_PTR(-EINVAL); 815 return ERR_PTR(-EINVAL);
868 if (rta->rta_type != CRYPTOA_TYPE) 816 if (rta->rta_type != CRYPTOA_TYPE)
869 return ERR_PTR(-EINVAL); 817 return ERR_PTR(-EINVAL);
870 818
871 algt = RTA_DATA(rta); 819 algt = RTA_DATA(rta);
872 820
873 return algt; 821 return algt;
874 } 822 }
875 EXPORT_SYMBOL_GPL(crypto_get_attr_type); 823 EXPORT_SYMBOL_GPL(crypto_get_attr_type);
876 824
877 /** 825 /**
878 * crypto_check_attr_type() - check algorithm 826 * crypto_check_attr_type() - check algorithm type and compute inherited mask
879 * @tb: the template parameters 827 * @tb: the template parameters
880 * @type: the algorithm type the template woul 828 * @type: the algorithm type the template would be instantiated as
881 * @mask_ret: (output) the mask that should be 829 * @mask_ret: (output) the mask that should be passed to crypto_grab_*()
882 * to restrict the flags of any inn 830 * to restrict the flags of any inner algorithms
883 * 831 *
884 * Validate that the algorithm type the user r 832 * Validate that the algorithm type the user requested is compatible with the
885 * one the template would actually be instanti 833 * one the template would actually be instantiated as. E.g., if the user is
886 * doing crypto_alloc_shash("cbc(aes)", ...), 834 * doing crypto_alloc_shash("cbc(aes)", ...), this would return an error because
887 * the "cbc" template creates an "skcipher" al 835 * the "cbc" template creates an "skcipher" algorithm, not an "shash" algorithm.
888 * 836 *
889 * Also compute the mask to use to restrict th 837 * Also compute the mask to use to restrict the flags of any inner algorithms.
890 * 838 *
891 * Return: 0 on success; -errno on failure 839 * Return: 0 on success; -errno on failure
892 */ 840 */
893 int crypto_check_attr_type(struct rtattr **tb, 841 int crypto_check_attr_type(struct rtattr **tb, u32 type, u32 *mask_ret)
894 { 842 {
895 struct crypto_attr_type *algt; 843 struct crypto_attr_type *algt;
896 844
897 algt = crypto_get_attr_type(tb); 845 algt = crypto_get_attr_type(tb);
898 if (IS_ERR(algt)) 846 if (IS_ERR(algt))
899 return PTR_ERR(algt); 847 return PTR_ERR(algt);
900 848
901 if ((algt->type ^ type) & algt->mask) 849 if ((algt->type ^ type) & algt->mask)
902 return -EINVAL; 850 return -EINVAL;
903 851
904 *mask_ret = crypto_algt_inherited_mask 852 *mask_ret = crypto_algt_inherited_mask(algt);
905 return 0; 853 return 0;
906 } 854 }
907 EXPORT_SYMBOL_GPL(crypto_check_attr_type); 855 EXPORT_SYMBOL_GPL(crypto_check_attr_type);
908 856
909 const char *crypto_attr_alg_name(struct rtattr 857 const char *crypto_attr_alg_name(struct rtattr *rta)
910 { 858 {
911 struct crypto_attr_alg *alga; 859 struct crypto_attr_alg *alga;
912 860
913 if (!rta) 861 if (!rta)
914 return ERR_PTR(-ENOENT); 862 return ERR_PTR(-ENOENT);
915 if (RTA_PAYLOAD(rta) < sizeof(*alga)) 863 if (RTA_PAYLOAD(rta) < sizeof(*alga))
916 return ERR_PTR(-EINVAL); 864 return ERR_PTR(-EINVAL);
917 if (rta->rta_type != CRYPTOA_ALG) 865 if (rta->rta_type != CRYPTOA_ALG)
918 return ERR_PTR(-EINVAL); 866 return ERR_PTR(-EINVAL);
919 867
920 alga = RTA_DATA(rta); 868 alga = RTA_DATA(rta);
921 alga->name[CRYPTO_MAX_ALG_NAME - 1] = 869 alga->name[CRYPTO_MAX_ALG_NAME - 1] = 0;
922 870
923 return alga->name; 871 return alga->name;
924 } 872 }
925 EXPORT_SYMBOL_GPL(crypto_attr_alg_name); 873 EXPORT_SYMBOL_GPL(crypto_attr_alg_name);
926 874
927 int crypto_inst_setname(struct crypto_instance 875 int crypto_inst_setname(struct crypto_instance *inst, const char *name,
928 struct crypto_alg *alg 876 struct crypto_alg *alg)
929 { 877 {
930 if (snprintf(inst->alg.cra_name, CRYPT 878 if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s(%s)", name,
931 alg->cra_name) >= CRYPTO_ 879 alg->cra_name) >= CRYPTO_MAX_ALG_NAME)
932 return -ENAMETOOLONG; 880 return -ENAMETOOLONG;
933 881
934 if (snprintf(inst->alg.cra_driver_name 882 if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",
935 name, alg->cra_driver_nam 883 name, alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
936 return -ENAMETOOLONG; 884 return -ENAMETOOLONG;
937 885
938 return 0; 886 return 0;
939 } 887 }
940 EXPORT_SYMBOL_GPL(crypto_inst_setname); 888 EXPORT_SYMBOL_GPL(crypto_inst_setname);
941 889
942 void crypto_init_queue(struct crypto_queue *qu 890 void crypto_init_queue(struct crypto_queue *queue, unsigned int max_qlen)
943 { 891 {
944 INIT_LIST_HEAD(&queue->list); 892 INIT_LIST_HEAD(&queue->list);
945 queue->backlog = &queue->list; 893 queue->backlog = &queue->list;
946 queue->qlen = 0; 894 queue->qlen = 0;
947 queue->max_qlen = max_qlen; 895 queue->max_qlen = max_qlen;
948 } 896 }
949 EXPORT_SYMBOL_GPL(crypto_init_queue); 897 EXPORT_SYMBOL_GPL(crypto_init_queue);
950 898
951 int crypto_enqueue_request(struct crypto_queue 899 int crypto_enqueue_request(struct crypto_queue *queue,
952 struct crypto_async 900 struct crypto_async_request *request)
953 { 901 {
954 int err = -EINPROGRESS; 902 int err = -EINPROGRESS;
955 903
956 if (unlikely(queue->qlen >= queue->max 904 if (unlikely(queue->qlen >= queue->max_qlen)) {
957 if (!(request->flags & CRYPTO_ 905 if (!(request->flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) {
958 err = -ENOSPC; 906 err = -ENOSPC;
959 goto out; 907 goto out;
960 } 908 }
961 err = -EBUSY; 909 err = -EBUSY;
962 if (queue->backlog == &queue-> 910 if (queue->backlog == &queue->list)
963 queue->backlog = &requ 911 queue->backlog = &request->list;
964 } 912 }
965 913
966 queue->qlen++; 914 queue->qlen++;
967 list_add_tail(&request->list, &queue-> 915 list_add_tail(&request->list, &queue->list);
968 916
969 out: 917 out:
970 return err; 918 return err;
971 } 919 }
972 EXPORT_SYMBOL_GPL(crypto_enqueue_request); 920 EXPORT_SYMBOL_GPL(crypto_enqueue_request);
973 921
974 void crypto_enqueue_request_head(struct crypto 922 void crypto_enqueue_request_head(struct crypto_queue *queue,
975 struct crypto 923 struct crypto_async_request *request)
976 { 924 {
977 if (unlikely(queue->qlen >= queue->max <<
978 queue->backlog = queue->backlo <<
979 <<
980 queue->qlen++; 925 queue->qlen++;
981 list_add(&request->list, &queue->list) 926 list_add(&request->list, &queue->list);
982 } 927 }
983 EXPORT_SYMBOL_GPL(crypto_enqueue_request_head) 928 EXPORT_SYMBOL_GPL(crypto_enqueue_request_head);
984 929
985 struct crypto_async_request *crypto_dequeue_re 930 struct crypto_async_request *crypto_dequeue_request(struct crypto_queue *queue)
986 { 931 {
987 struct list_head *request; 932 struct list_head *request;
988 933
989 if (unlikely(!queue->qlen)) 934 if (unlikely(!queue->qlen))
990 return NULL; 935 return NULL;
991 936
992 queue->qlen--; 937 queue->qlen--;
993 938
994 if (queue->backlog != &queue->list) 939 if (queue->backlog != &queue->list)
995 queue->backlog = queue->backlo 940 queue->backlog = queue->backlog->next;
996 941
997 request = queue->list.next; 942 request = queue->list.next;
998 list_del(request); 943 list_del(request);
999 944
1000 return list_entry(request, struct cry 945 return list_entry(request, struct crypto_async_request, list);
1001 } 946 }
1002 EXPORT_SYMBOL_GPL(crypto_dequeue_request); 947 EXPORT_SYMBOL_GPL(crypto_dequeue_request);
1003 948
1004 static inline void crypto_inc_byte(u8 *a, uns 949 static inline void crypto_inc_byte(u8 *a, unsigned int size)
1005 { 950 {
1006 u8 *b = (a + size); 951 u8 *b = (a + size);
1007 u8 c; 952 u8 c;
1008 953
1009 for (; size; size--) { 954 for (; size; size--) {
1010 c = *--b + 1; 955 c = *--b + 1;
1011 *b = c; 956 *b = c;
1012 if (c) 957 if (c)
1013 break; 958 break;
1014 } 959 }
1015 } 960 }
1016 961
1017 void crypto_inc(u8 *a, unsigned int size) 962 void crypto_inc(u8 *a, unsigned int size)
1018 { 963 {
1019 __be32 *b = (__be32 *)(a + size); 964 __be32 *b = (__be32 *)(a + size);
1020 u32 c; 965 u32 c;
1021 966
1022 if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_ 967 if (IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) ||
1023 IS_ALIGNED((unsigned long)b, __al 968 IS_ALIGNED((unsigned long)b, __alignof__(*b)))
1024 for (; size >= 4; size -= 4) 969 for (; size >= 4; size -= 4) {
1025 c = be32_to_cpu(*--b) 970 c = be32_to_cpu(*--b) + 1;
1026 *b = cpu_to_be32(c); 971 *b = cpu_to_be32(c);
1027 if (likely(c)) 972 if (likely(c))
1028 return; 973 return;
1029 } 974 }
1030 975
1031 crypto_inc_byte(a, size); 976 crypto_inc_byte(a, size);
1032 } 977 }
1033 EXPORT_SYMBOL_GPL(crypto_inc); 978 EXPORT_SYMBOL_GPL(crypto_inc);
1034 979
>> 980 void __crypto_xor(u8 *dst, const u8 *src1, const u8 *src2, unsigned int len)
>> 981 {
>> 982 int relalign = 0;
>> 983
>> 984 if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS)) {
>> 985 int size = sizeof(unsigned long);
>> 986 int d = (((unsigned long)dst ^ (unsigned long)src1) |
>> 987 ((unsigned long)dst ^ (unsigned long)src2)) &
>> 988 (size - 1);
>> 989
>> 990 relalign = d ? 1 << __ffs(d) : size;
>> 991
>> 992 /*
>> 993 * If we care about alignment, process as many bytes as
>> 994 * needed to advance dst and src to values whose alignments
>> 995 * equal their relative alignment. This will allow us to
>> 996 * process the remainder of the input using optimal strides.
>> 997 */
>> 998 while (((unsigned long)dst & (relalign - 1)) && len > 0) {
>> 999 *dst++ = *src1++ ^ *src2++;
>> 1000 len--;
>> 1001 }
>> 1002 }
>> 1003
>> 1004 while (IS_ENABLED(CONFIG_64BIT) && len >= 8 && !(relalign & 7)) {
>> 1005 *(u64 *)dst = *(u64 *)src1 ^ *(u64 *)src2;
>> 1006 dst += 8;
>> 1007 src1 += 8;
>> 1008 src2 += 8;
>> 1009 len -= 8;
>> 1010 }
>> 1011
>> 1012 while (len >= 4 && !(relalign & 3)) {
>> 1013 *(u32 *)dst = *(u32 *)src1 ^ *(u32 *)src2;
>> 1014 dst += 4;
>> 1015 src1 += 4;
>> 1016 src2 += 4;
>> 1017 len -= 4;
>> 1018 }
>> 1019
>> 1020 while (len >= 2 && !(relalign & 1)) {
>> 1021 *(u16 *)dst = *(u16 *)src1 ^ *(u16 *)src2;
>> 1022 dst += 2;
>> 1023 src1 += 2;
>> 1024 src2 += 2;
>> 1025 len -= 2;
>> 1026 }
>> 1027
>> 1028 while (len--)
>> 1029 *dst++ = *src1++ ^ *src2++;
>> 1030 }
>> 1031 EXPORT_SYMBOL_GPL(__crypto_xor);
>> 1032
1035 unsigned int crypto_alg_extsize(struct crypto 1033 unsigned int crypto_alg_extsize(struct crypto_alg *alg)
1036 { 1034 {
1037 return alg->cra_ctxsize + 1035 return alg->cra_ctxsize +
1038 (alg->cra_alignmask & ~(crypto 1036 (alg->cra_alignmask & ~(crypto_tfm_ctx_alignment() - 1));
1039 } 1037 }
1040 EXPORT_SYMBOL_GPL(crypto_alg_extsize); 1038 EXPORT_SYMBOL_GPL(crypto_alg_extsize);
1041 1039
1042 int crypto_type_has_alg(const char *name, con 1040 int crypto_type_has_alg(const char *name, const struct crypto_type *frontend,
1043 u32 type, u32 mask) 1041 u32 type, u32 mask)
1044 { 1042 {
1045 int ret = 0; 1043 int ret = 0;
1046 struct crypto_alg *alg = crypto_find_ 1044 struct crypto_alg *alg = crypto_find_alg(name, frontend, type, mask);
1047 1045
1048 if (!IS_ERR(alg)) { 1046 if (!IS_ERR(alg)) {
1049 crypto_mod_put(alg); 1047 crypto_mod_put(alg);
1050 ret = 1; 1048 ret = 1;
1051 } 1049 }
1052 1050
1053 return ret; 1051 return ret;
1054 } 1052 }
1055 EXPORT_SYMBOL_GPL(crypto_type_has_alg); 1053 EXPORT_SYMBOL_GPL(crypto_type_has_alg);
1056 1054
1057 static void __init crypto_start_tests(void) !! 1055 #ifdef CONFIG_CRYPTO_STATS
>> 1056 void crypto_stats_init(struct crypto_alg *alg)
1058 { 1057 {
1059 if (!IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) !! 1058 memset(&alg->stats, 0, sizeof(alg->stats));
1060 return; !! 1059 }
>> 1060 EXPORT_SYMBOL_GPL(crypto_stats_init);
1061 1061
1062 if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_ !! 1062 void crypto_stats_get(struct crypto_alg *alg)
1063 return; !! 1063 {
>> 1064 crypto_alg_get(alg);
>> 1065 }
>> 1066 EXPORT_SYMBOL_GPL(crypto_stats_get);
>> 1067
>> 1068 void crypto_stats_aead_encrypt(unsigned int cryptlen, struct crypto_alg *alg,
>> 1069 int ret)
>> 1070 {
>> 1071 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1072 atomic64_inc(&alg->stats.aead.err_cnt);
>> 1073 } else {
>> 1074 atomic64_inc(&alg->stats.aead.encrypt_cnt);
>> 1075 atomic64_add(cryptlen, &alg->stats.aead.encrypt_tlen);
>> 1076 }
>> 1077 crypto_alg_put(alg);
>> 1078 }
>> 1079 EXPORT_SYMBOL_GPL(crypto_stats_aead_encrypt);
>> 1080
>> 1081 void crypto_stats_aead_decrypt(unsigned int cryptlen, struct crypto_alg *alg,
>> 1082 int ret)
>> 1083 {
>> 1084 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1085 atomic64_inc(&alg->stats.aead.err_cnt);
>> 1086 } else {
>> 1087 atomic64_inc(&alg->stats.aead.decrypt_cnt);
>> 1088 atomic64_add(cryptlen, &alg->stats.aead.decrypt_tlen);
>> 1089 }
>> 1090 crypto_alg_put(alg);
>> 1091 }
>> 1092 EXPORT_SYMBOL_GPL(crypto_stats_aead_decrypt);
>> 1093
>> 1094 void crypto_stats_akcipher_encrypt(unsigned int src_len, int ret,
>> 1095 struct crypto_alg *alg)
>> 1096 {
>> 1097 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1098 atomic64_inc(&alg->stats.akcipher.err_cnt);
>> 1099 } else {
>> 1100 atomic64_inc(&alg->stats.akcipher.encrypt_cnt);
>> 1101 atomic64_add(src_len, &alg->stats.akcipher.encrypt_tlen);
>> 1102 }
>> 1103 crypto_alg_put(alg);
>> 1104 }
>> 1105 EXPORT_SYMBOL_GPL(crypto_stats_akcipher_encrypt);
>> 1106
>> 1107 void crypto_stats_akcipher_decrypt(unsigned int src_len, int ret,
>> 1108 struct crypto_alg *alg)
>> 1109 {
>> 1110 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1111 atomic64_inc(&alg->stats.akcipher.err_cnt);
>> 1112 } else {
>> 1113 atomic64_inc(&alg->stats.akcipher.decrypt_cnt);
>> 1114 atomic64_add(src_len, &alg->stats.akcipher.decrypt_tlen);
>> 1115 }
>> 1116 crypto_alg_put(alg);
>> 1117 }
>> 1118 EXPORT_SYMBOL_GPL(crypto_stats_akcipher_decrypt);
>> 1119
>> 1120 void crypto_stats_akcipher_sign(int ret, struct crypto_alg *alg)
>> 1121 {
>> 1122 if (ret && ret != -EINPROGRESS && ret != -EBUSY)
>> 1123 atomic64_inc(&alg->stats.akcipher.err_cnt);
>> 1124 else
>> 1125 atomic64_inc(&alg->stats.akcipher.sign_cnt);
>> 1126 crypto_alg_put(alg);
>> 1127 }
>> 1128 EXPORT_SYMBOL_GPL(crypto_stats_akcipher_sign);
>> 1129
>> 1130 void crypto_stats_akcipher_verify(int ret, struct crypto_alg *alg)
>> 1131 {
>> 1132 if (ret && ret != -EINPROGRESS && ret != -EBUSY)
>> 1133 atomic64_inc(&alg->stats.akcipher.err_cnt);
>> 1134 else
>> 1135 atomic64_inc(&alg->stats.akcipher.verify_cnt);
>> 1136 crypto_alg_put(alg);
>> 1137 }
>> 1138 EXPORT_SYMBOL_GPL(crypto_stats_akcipher_verify);
>> 1139
>> 1140 void crypto_stats_compress(unsigned int slen, int ret, struct crypto_alg *alg)
>> 1141 {
>> 1142 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1143 atomic64_inc(&alg->stats.compress.err_cnt);
>> 1144 } else {
>> 1145 atomic64_inc(&alg->stats.compress.compress_cnt);
>> 1146 atomic64_add(slen, &alg->stats.compress.compress_tlen);
>> 1147 }
>> 1148 crypto_alg_put(alg);
>> 1149 }
>> 1150 EXPORT_SYMBOL_GPL(crypto_stats_compress);
>> 1151
>> 1152 void crypto_stats_decompress(unsigned int slen, int ret, struct crypto_alg *alg)
>> 1153 {
>> 1154 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1155 atomic64_inc(&alg->stats.compress.err_cnt);
>> 1156 } else {
>> 1157 atomic64_inc(&alg->stats.compress.decompress_cnt);
>> 1158 atomic64_add(slen, &alg->stats.compress.decompress_tlen);
>> 1159 }
>> 1160 crypto_alg_put(alg);
>> 1161 }
>> 1162 EXPORT_SYMBOL_GPL(crypto_stats_decompress);
>> 1163
>> 1164 void crypto_stats_ahash_update(unsigned int nbytes, int ret,
>> 1165 struct crypto_alg *alg)
>> 1166 {
>> 1167 if (ret && ret != -EINPROGRESS && ret != -EBUSY)
>> 1168 atomic64_inc(&alg->stats.hash.err_cnt);
>> 1169 else
>> 1170 atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
>> 1171 crypto_alg_put(alg);
>> 1172 }
>> 1173 EXPORT_SYMBOL_GPL(crypto_stats_ahash_update);
>> 1174
>> 1175 void crypto_stats_ahash_final(unsigned int nbytes, int ret,
>> 1176 struct crypto_alg *alg)
>> 1177 {
>> 1178 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1179 atomic64_inc(&alg->stats.hash.err_cnt);
>> 1180 } else {
>> 1181 atomic64_inc(&alg->stats.hash.hash_cnt);
>> 1182 atomic64_add(nbytes, &alg->stats.hash.hash_tlen);
>> 1183 }
>> 1184 crypto_alg_put(alg);
>> 1185 }
>> 1186 EXPORT_SYMBOL_GPL(crypto_stats_ahash_final);
1064 1187
>> 1188 void crypto_stats_kpp_set_secret(struct crypto_alg *alg, int ret)
>> 1189 {
>> 1190 if (ret)
>> 1191 atomic64_inc(&alg->stats.kpp.err_cnt);
>> 1192 else
>> 1193 atomic64_inc(&alg->stats.kpp.setsecret_cnt);
>> 1194 crypto_alg_put(alg);
>> 1195 }
>> 1196 EXPORT_SYMBOL_GPL(crypto_stats_kpp_set_secret);
>> 1197
>> 1198 void crypto_stats_kpp_generate_public_key(struct crypto_alg *alg, int ret)
>> 1199 {
>> 1200 if (ret)
>> 1201 atomic64_inc(&alg->stats.kpp.err_cnt);
>> 1202 else
>> 1203 atomic64_inc(&alg->stats.kpp.generate_public_key_cnt);
>> 1204 crypto_alg_put(alg);
>> 1205 }
>> 1206 EXPORT_SYMBOL_GPL(crypto_stats_kpp_generate_public_key);
>> 1207
>> 1208 void crypto_stats_kpp_compute_shared_secret(struct crypto_alg *alg, int ret)
>> 1209 {
>> 1210 if (ret)
>> 1211 atomic64_inc(&alg->stats.kpp.err_cnt);
>> 1212 else
>> 1213 atomic64_inc(&alg->stats.kpp.compute_shared_secret_cnt);
>> 1214 crypto_alg_put(alg);
>> 1215 }
>> 1216 EXPORT_SYMBOL_GPL(crypto_stats_kpp_compute_shared_secret);
>> 1217
>> 1218 void crypto_stats_rng_seed(struct crypto_alg *alg, int ret)
>> 1219 {
>> 1220 if (ret && ret != -EINPROGRESS && ret != -EBUSY)
>> 1221 atomic64_inc(&alg->stats.rng.err_cnt);
>> 1222 else
>> 1223 atomic64_inc(&alg->stats.rng.seed_cnt);
>> 1224 crypto_alg_put(alg);
>> 1225 }
>> 1226 EXPORT_SYMBOL_GPL(crypto_stats_rng_seed);
>> 1227
>> 1228 void crypto_stats_rng_generate(struct crypto_alg *alg, unsigned int dlen,
>> 1229 int ret)
>> 1230 {
>> 1231 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1232 atomic64_inc(&alg->stats.rng.err_cnt);
>> 1233 } else {
>> 1234 atomic64_inc(&alg->stats.rng.generate_cnt);
>> 1235 atomic64_add(dlen, &alg->stats.rng.generate_tlen);
>> 1236 }
>> 1237 crypto_alg_put(alg);
>> 1238 }
>> 1239 EXPORT_SYMBOL_GPL(crypto_stats_rng_generate);
>> 1240
>> 1241 void crypto_stats_skcipher_encrypt(unsigned int cryptlen, int ret,
>> 1242 struct crypto_alg *alg)
>> 1243 {
>> 1244 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1245 atomic64_inc(&alg->stats.cipher.err_cnt);
>> 1246 } else {
>> 1247 atomic64_inc(&alg->stats.cipher.encrypt_cnt);
>> 1248 atomic64_add(cryptlen, &alg->stats.cipher.encrypt_tlen);
>> 1249 }
>> 1250 crypto_alg_put(alg);
>> 1251 }
>> 1252 EXPORT_SYMBOL_GPL(crypto_stats_skcipher_encrypt);
>> 1253
>> 1254 void crypto_stats_skcipher_decrypt(unsigned int cryptlen, int ret,
>> 1255 struct crypto_alg *alg)
>> 1256 {
>> 1257 if (ret && ret != -EINPROGRESS && ret != -EBUSY) {
>> 1258 atomic64_inc(&alg->stats.cipher.err_cnt);
>> 1259 } else {
>> 1260 atomic64_inc(&alg->stats.cipher.decrypt_cnt);
>> 1261 atomic64_add(cryptlen, &alg->stats.cipher.decrypt_tlen);
>> 1262 }
>> 1263 crypto_alg_put(alg);
>> 1264 }
>> 1265 EXPORT_SYMBOL_GPL(crypto_stats_skcipher_decrypt);
>> 1266 #endif
>> 1267
>> 1268 static void __init crypto_start_tests(void)
>> 1269 {
1065 for (;;) { 1270 for (;;) {
1066 struct crypto_larval *larval 1271 struct crypto_larval *larval = NULL;
1067 struct crypto_alg *q; 1272 struct crypto_alg *q;
1068 1273
1069 down_write(&crypto_alg_sem); 1274 down_write(&crypto_alg_sem);
1070 1275
1071 list_for_each_entry(q, &crypt 1276 list_for_each_entry(q, &crypto_alg_list, cra_list) {
1072 struct crypto_larval 1277 struct crypto_larval *l;
1073 1278
1074 if (!crypto_is_larval 1279 if (!crypto_is_larval(q))
1075 continue; 1280 continue;
1076 1281
1077 l = (void *)q; 1282 l = (void *)q;
1078 1283
1079 if (!crypto_is_test_l 1284 if (!crypto_is_test_larval(l))
1080 continue; 1285 continue;
1081 1286
1082 if (l->test_started) 1287 if (l->test_started)
1083 continue; 1288 continue;
1084 1289
1085 l->test_started = tru 1290 l->test_started = true;
1086 larval = l; 1291 larval = l;
1087 break; 1292 break;
1088 } 1293 }
1089 1294
1090 up_write(&crypto_alg_sem); 1295 up_write(&crypto_alg_sem);
1091 1296
1092 if (!larval) 1297 if (!larval)
1093 break; 1298 break;
1094 1299
1095 crypto_wait_for_test(larval); 1300 crypto_wait_for_test(larval);
1096 } 1301 }
1097 1302
1098 set_crypto_boot_test_finished(); !! 1303 static_branch_enable(&crypto_boot_test_finished);
1099 } 1304 }
1100 1305
1101 static int __init crypto_algapi_init(void) 1306 static int __init crypto_algapi_init(void)
1102 { 1307 {
1103 crypto_init_proc(); 1308 crypto_init_proc();
1104 crypto_start_tests(); 1309 crypto_start_tests();
1105 return 0; 1310 return 0;
1106 } 1311 }
1107 1312
1108 static void __exit crypto_algapi_exit(void) 1313 static void __exit crypto_algapi_exit(void)
1109 { 1314 {
1110 crypto_exit_proc(); 1315 crypto_exit_proc();
1111 } 1316 }
1112 1317
1113 /* 1318 /*
1114 * We run this at late_initcall so that all t 1319 * We run this at late_initcall so that all the built-in algorithms
1115 * have had a chance to register themselves f 1320 * have had a chance to register themselves first.
1116 */ 1321 */
1117 late_initcall(crypto_algapi_init); 1322 late_initcall(crypto_algapi_init);
1118 module_exit(crypto_algapi_exit); 1323 module_exit(crypto_algapi_exit);
1119 1324
1120 MODULE_LICENSE("GPL"); 1325 MODULE_LICENSE("GPL");
1121 MODULE_DESCRIPTION("Cryptographic algorithms 1326 MODULE_DESCRIPTION("Cryptographic algorithms API");
1122 MODULE_SOFTDEP("pre: cryptomgr"); 1327 MODULE_SOFTDEP("pre: cryptomgr");
1123 1328
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.