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