1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
|
From 4078382cfc69c0f5e582d485fe8cc778f9e458d1 Mon Sep 17 00:00:00 2001
From: Cristian Stoica <cristian.stoica@freescale.com>
Date: Mon, 21 Sep 2015 16:39:52 +0300
Subject: [PATCH 21/23] check return codes for copy to/from user functions
- these functions may fail and we should check their return codes.
- fix an unintended fall-through in CRK_DSA_GENERATE_KEY
- fix incorrect return code for CIOCASYMFETCHCOOKIE
Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
---
ioctl.c | 42 +++++++--------
main.c | 183 ++++++++++++++++++++++++++++++----------------------------------
2 files changed, 108 insertions(+), 117 deletions(-)
diff --git a/ioctl.c b/ioctl.c
index 7cd3c56..8fa3e5c 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -711,13 +711,13 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
case CRK_MOD_EXP:
{
struct rsa_pub_req_s *rsa_req = &pkc->req->req_u.rsa_pub_req;
- copy_to_user(ckop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
+ ret = copy_to_user(ckop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
}
break;
case CRK_MOD_EXP_CRT:
{
struct rsa_priv_frm3_req_s *rsa_req = &pkc->req->req_u.rsa_priv_f3;
- copy_to_user(ckop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
+ ret = copy_to_user(ckop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
}
break;
case CRK_DSA_SIGN:
@@ -725,11 +725,11 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
struct dsa_sign_req_s *dsa_req = &pkc->req->req_u.dsa_sign;
if (pkc->req->type == ECDSA_SIGN) {
- copy_to_user(ckop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len);
- copy_to_user(ckop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
+ ret = copy_to_user(ckop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len) ||
+ copy_to_user(ckop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
} else {
- copy_to_user(ckop->crk_param[5].crp_p, dsa_req->c, dsa_req->d_len);
- copy_to_user(ckop->crk_param[6].crp_p, dsa_req->d, dsa_req->d_len);
+ ret = copy_to_user(ckop->crk_param[5].crp_p, dsa_req->c, dsa_req->d_len) ||
+ copy_to_user(ckop->crk_param[6].crp_p, dsa_req->d, dsa_req->d_len);
}
}
break;
@@ -739,9 +739,9 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
{
struct dh_key_req_s *dh_req = &pkc->req->req_u.dh_req;
if (pkc->req->type == ECDH_COMPUTE_KEY)
- copy_to_user(ckop->crk_param[4].crp_p, dh_req->z, dh_req->z_len);
+ ret = copy_to_user(ckop->crk_param[4].crp_p, dh_req->z, dh_req->z_len);
else
- copy_to_user(ckop->crk_param[3].crp_p, dh_req->z, dh_req->z_len);
+ ret = copy_to_user(ckop->crk_param[3].crp_p, dh_req->z, dh_req->z_len);
}
break;
case CRK_DSA_GENERATE_KEY:
@@ -750,16 +750,17 @@ static int crypto_async_fetch_asym(struct cryptodev_pkc *pkc)
struct keygen_req_s *key_req = &pkc->req->req_u.keygen;
if (pkc->req->type == ECC_KEYGEN) {
- copy_to_user(ckop->crk_param[4].crp_p, key_req->pub_key,
- key_req->pub_key_len);
- copy_to_user(ckop->crk_param[5].crp_p, key_req->priv_key,
+ ret = copy_to_user(ckop->crk_param[4].crp_p, key_req->pub_key,
+ key_req->pub_key_len) ||
+ copy_to_user(ckop->crk_param[5].crp_p, key_req->priv_key,
key_req->priv_key_len);
} else {
- copy_to_user(ckop->crk_param[3].crp_p, key_req->pub_key,
- key_req->pub_key_len);
- copy_to_user(ckop->crk_param[4].crp_p, key_req->priv_key,
+ ret = copy_to_user(ckop->crk_param[3].crp_p, key_req->pub_key,
+ key_req->pub_key_len) ||
+ copy_to_user(ckop->crk_param[4].crp_p, key_req->priv_key,
key_req->priv_key_len);
}
+ break;
}
default:
ret = -EINVAL;
@@ -1115,14 +1116,12 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_)
/* Reflect the updated request to user-space */
if (cookie_list.cookie_available) {
- copy_to_user(arg, &cookie_list, sizeof(struct pkc_cookie_list_s));
+ ret = copy_to_user(arg, &cookie_list, sizeof(struct pkc_cookie_list_s));
} else {
struct pkc_cookie_list_s *user_ck_list = (void *)arg;
- put_user(0, &(user_ck_list->cookie_available));
+ ret = put_user(0, &(user_ck_list->cookie_available));
}
- ret = cookie_list.cookie_available;
}
-
return ret;
default:
return -EINVAL;
@@ -1417,9 +1416,10 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_)
}
/* Reflect the updated request to user-space */
- if (cookie_list.cookie_available)
- copy_to_user(arg, &cookie_list,
- sizeof(struct compat_pkc_cookie_list_s));
+ if (cookie_list.cookie_available) {
+ ret = copy_to_user(arg, &cookie_list,
+ sizeof(struct compat_pkc_cookie_list_s));
+ }
}
return ret;
default:
diff --git a/main.c b/main.c
index ed1c69a..e5adb93 100644
--- a/main.c
+++ b/main.c
@@ -223,31 +223,29 @@ int crypto_kop_dsasign(struct cryptodev_pkc *pkc)
dsa_req->m = dsa_req->priv_key + dsa_req->priv_key_len;
dsa_req->c = dsa_req->m + dsa_req->m_len;
dsa_req->d = dsa_req->c + dsa_req->d_len;
- copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len);
- copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len);
- copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len);
- copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len);
- copy_from_user(dsa_req->priv_key, cop->crk_param[4].crp_p,
- dsa_req->priv_key_len);
+ rc = copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len) ||
+ copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len) ||
+ copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len) ||
+ copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len) ||
+ copy_from_user(dsa_req->priv_key, cop->crk_param[4].crp_p, dsa_req->priv_key_len);
if (cop->crk_iparams == 6) {
dsa_req->ab = dsa_req->d + dsa_req->d_len;
- copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p,
+ rc = rc || copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p,
dsa_req->ab_len);
}
+ if (rc)
+ goto err;
+
rc = cryptodev_pkc_offload(pkc);
if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
if (cop->crk_iparams == 6) {
- copy_to_user(cop->crk_param[6].crp_p, dsa_req->c,
- dsa_req->d_len);
- copy_to_user(cop->crk_param[7].crp_p, dsa_req->d,
- dsa_req->d_len);
+ rc = rc ||
+ copy_to_user(cop->crk_param[6].crp_p, dsa_req->c, dsa_req->d_len) ||
+ copy_to_user(cop->crk_param[7].crp_p, dsa_req->d, dsa_req->d_len);
} else {
- copy_to_user(cop->crk_param[5].crp_p, dsa_req->c,
- dsa_req->d_len);
- copy_to_user(cop->crk_param[6].crp_p, dsa_req->d,
- dsa_req->d_len);
+ rc = rc ||
+ copy_to_user(cop->crk_param[5].crp_p, dsa_req->c, dsa_req->d_len) ||
+ copy_to_user(cop->crk_param[6].crp_p, dsa_req->d, dsa_req->d_len);
}
} else {
if (rc != -EINPROGRESS && rc != 0)
@@ -303,31 +301,28 @@ int crypto_kop_dsaverify(struct cryptodev_pkc *pkc)
dsa_req->m = dsa_req->pub_key + dsa_req->pub_key_len;
dsa_req->c = dsa_req->m + dsa_req->m_len;
dsa_req->d = dsa_req->c + dsa_req->d_len;
- copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len);
- copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len);
- copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len);
- copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len);
- copy_from_user(dsa_req->pub_key, cop->crk_param[4].crp_p,
- dsa_req->pub_key_len);
+ rc = copy_from_user(dsa_req->m, cop->crk_param[0].crp_p, dsa_req->m_len) ||
+ copy_from_user(dsa_req->q, cop->crk_param[1].crp_p, dsa_req->q_len) ||
+ copy_from_user(dsa_req->r, cop->crk_param[2].crp_p, dsa_req->r_len) ||
+ copy_from_user(dsa_req->g, cop->crk_param[3].crp_p, dsa_req->g_len) ||
+ copy_from_user(dsa_req->pub_key, cop->crk_param[4].crp_p, dsa_req->pub_key_len);
if (cop->crk_iparams == 8) {
dsa_req->ab = dsa_req->d + dsa_req->d_len;
- copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p,
- dsa_req->ab_len);
- copy_from_user(dsa_req->c, cop->crk_param[6].crp_p,
- dsa_req->d_len);
- copy_from_user(dsa_req->d, cop->crk_param[7].crp_p,
- dsa_req->d_len);
+ rc = rc ||
+ copy_from_user(dsa_req->ab, cop->crk_param[5].crp_p, dsa_req->ab_len) ||
+ copy_from_user(dsa_req->c, cop->crk_param[6].crp_p, dsa_req->d_len) ||
+ copy_from_user(dsa_req->d, cop->crk_param[7].crp_p, dsa_req->d_len);
} else {
- copy_from_user(dsa_req->c, cop->crk_param[5].crp_p,
- dsa_req->d_len);
- copy_from_user(dsa_req->d, cop->crk_param[6].crp_p,
- dsa_req->d_len);
+ rc = rc ||
+ copy_from_user(dsa_req->c, cop->crk_param[5].crp_p, dsa_req->d_len) ||
+ copy_from_user(dsa_req->d, cop->crk_param[6].crp_p, dsa_req->d_len);
}
+
+ if (rc)
+ goto err;
+
rc = cryptodev_pkc_offload(pkc);
- if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
- } else {
+ if (pkc->type != SYNCHRONOUS) {
if (rc != -EINPROGRESS && !rc)
goto err;
pkc->cookie = buf;
@@ -380,24 +375,15 @@ int crypto_kop_rsa_keygen(struct cryptodev_pkc *pkc)
rc = cryptodev_pkc_offload(pkc);
if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
-
- copy_to_user(cop->crk_param[0].crp_p,
- key_req->p, key_req->p_len);
- copy_to_user(cop->crk_param[1].crp_p,
- key_req->q, key_req->q_len);
- copy_to_user(cop->crk_param[2].crp_p,
- key_req->n, key_req->n_len);
- copy_to_user(cop->crk_param[3].crp_p,
- key_req->d, key_req->d_len);
- copy_to_user(cop->crk_param[4].crp_p,
- key_req->dp, key_req->dp_len);
- copy_to_user(cop->crk_param[5].crp_p,
- key_req->dq, key_req->dq_len);
- copy_to_user(cop->crk_param[6].crp_p,
- key_req->c, key_req->c_len);
- } else {
+ rc = rc ||
+ copy_to_user(cop->crk_param[0].crp_p, key_req->p, key_req->p_len) ||
+ copy_to_user(cop->crk_param[1].crp_p, key_req->q, key_req->q_len) ||
+ copy_to_user(cop->crk_param[2].crp_p, key_req->n, key_req->n_len) ||
+ copy_to_user(cop->crk_param[3].crp_p, key_req->d, key_req->d_len) ||
+ copy_to_user(cop->crk_param[4].crp_p, key_req->dp, key_req->dp_len) ||
+ copy_to_user(cop->crk_param[5].crp_p, key_req->dq, key_req->dq_len) ||
+ copy_to_user(cop->crk_param[6].crp_p, key_req->c, key_req->c_len);
+ } else {
if (rc != -EINPROGRESS && !rc) {
printk("%s: Failed\n", __func__);
goto err;
@@ -451,30 +437,33 @@ int crypto_kop_keygen(struct cryptodev_pkc *pkc)
key_req->g = key_req->r + key_req->r_len;
key_req->pub_key = key_req->g + key_req->g_len;
key_req->priv_key = key_req->pub_key + key_req->pub_key_len;
- copy_from_user(key_req->q, cop->crk_param[0].crp_p, key_req->q_len);
- copy_from_user(key_req->r, cop->crk_param[1].crp_p, key_req->r_len);
- copy_from_user(key_req->g, cop->crk_param[2].crp_p, key_req->g_len);
+ rc = copy_from_user(key_req->q, cop->crk_param[0].crp_p, key_req->q_len) ||
+ copy_from_user(key_req->r, cop->crk_param[1].crp_p, key_req->r_len) ||
+ copy_from_user(key_req->g, cop->crk_param[2].crp_p, key_req->g_len);
+
if (cop->crk_iparams == 4) {
key_req->ab = key_req->priv_key + key_req->priv_key_len;
- copy_from_user(key_req->ab, cop->crk_param[3].crp_p,
+ rc = rc || copy_from_user(key_req->ab, cop->crk_param[3].crp_p,
key_req->ab_len);
}
+ if (rc)
+ goto err;
+
rc = cryptodev_pkc_offload(pkc);
if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
-
if (cop->crk_iparams == 4) {
- copy_to_user(cop->crk_param[4].crp_p, key_req->pub_key,
- key_req->pub_key_len);
- copy_to_user(cop->crk_param[5].crp_p, key_req->priv_key,
+ rc = rc ||
+ copy_to_user(cop->crk_param[4].crp_p, key_req->pub_key,
+ key_req->pub_key_len) ||
+ copy_to_user(cop->crk_param[5].crp_p, key_req->priv_key,
key_req->priv_key_len);
} else {
- copy_to_user(cop->crk_param[3].crp_p, key_req->pub_key,
- key_req->pub_key_len);
- copy_to_user(cop->crk_param[4].crp_p,
- key_req->priv_key, key_req->priv_key_len);
+ rc = rc ||
+ copy_to_user(cop->crk_param[3].crp_p, key_req->pub_key,
+ key_req->pub_key_len) ||
+ copy_to_user(cop->crk_param[4].crp_p, key_req->priv_key,
+ key_req->priv_key_len);
}
} else {
if (rc != -EINPROGRESS && !rc)
@@ -495,7 +484,7 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
struct dh_key_req_s *dh_req;
int buf_size;
uint8_t *buf;
- int rc = -EINVAL;
+ int rc = 0;
dh_req = &pkc->req->req_u.dh_req;
dh_req->s_len = (cop->crk_param[0].crp_nbits + 7)/8;
@@ -520,22 +509,23 @@ int crypto_kop_dh_key(struct cryptodev_pkc *pkc)
if (cop->crk_iparams == 4) {
dh_req->ab = dh_req->z + dh_req->z_len;
pkc->req->curve_type = cop->curve_type;
- copy_from_user(dh_req->ab, cop->crk_param[3].crp_p,
- dh_req->ab_len);
+ rc = copy_from_user(dh_req->ab, cop->crk_param[3].crp_p, dh_req->ab_len);
}
- copy_from_user(dh_req->s, cop->crk_param[0].crp_p, dh_req->s_len);
- copy_from_user(dh_req->pub_key, cop->crk_param[1].crp_p,
- dh_req->pub_key_len);
- copy_from_user(dh_req->q, cop->crk_param[2].crp_p, dh_req->q_len);
+
+ rc = rc ||
+ copy_from_user(dh_req->s, cop->crk_param[0].crp_p, dh_req->s_len) ||
+ copy_from_user(dh_req->pub_key, cop->crk_param[1].crp_p, dh_req->pub_key_len) ||
+ copy_from_user(dh_req->q, cop->crk_param[2].crp_p, dh_req->q_len);
+ if (rc)
+ goto err;
+
rc = cryptodev_pkc_offload(pkc);
if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
if (cop->crk_iparams == 4)
- copy_to_user(cop->crk_param[4].crp_p, dh_req->z,
+ rc = rc || copy_to_user(cop->crk_param[4].crp_p, dh_req->z,
dh_req->z_len);
else
- copy_to_user(cop->crk_param[3].crp_p, dh_req->z,
+ rc = rc || copy_to_user(cop->crk_param[3].crp_p, dh_req->z,
dh_req->z_len);
} else {
if (rc != -EINPROGRESS && rc != 0)
@@ -582,19 +572,19 @@ int crypto_modexp_crt(struct cryptodev_pkc *pkc)
rsa_req->dq = rsa_req->dp + rsa_req->dp_len;
rsa_req->c = rsa_req->dq + rsa_req->dq_len;
rsa_req->f = rsa_req->c + rsa_req->c_len;
- copy_from_user(rsa_req->p, cop->crk_param[0].crp_p, rsa_req->p_len);
- copy_from_user(rsa_req->q, cop->crk_param[1].crp_p, rsa_req->q_len);
- copy_from_user(rsa_req->g, cop->crk_param[2].crp_p, rsa_req->g_len);
- copy_from_user(rsa_req->dp, cop->crk_param[3].crp_p, rsa_req->dp_len);
- copy_from_user(rsa_req->dq, cop->crk_param[4].crp_p, rsa_req->dq_len);
- copy_from_user(rsa_req->c, cop->crk_param[5].crp_p, rsa_req->c_len);
+ rc = copy_from_user(rsa_req->p, cop->crk_param[0].crp_p, rsa_req->p_len) ||
+ copy_from_user(rsa_req->q, cop->crk_param[1].crp_p, rsa_req->q_len) ||
+ copy_from_user(rsa_req->g, cop->crk_param[2].crp_p, rsa_req->g_len) ||
+ copy_from_user(rsa_req->dp, cop->crk_param[3].crp_p, rsa_req->dp_len) ||
+ copy_from_user(rsa_req->dq, cop->crk_param[4].crp_p, rsa_req->dq_len) ||
+ copy_from_user(rsa_req->c, cop->crk_param[5].crp_p, rsa_req->c_len);
+ if (rc)
+ goto err;
+
rc = cryptodev_pkc_offload(pkc);
if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
- copy_to_user(cop->crk_param[6].crp_p, rsa_req->f,
- rsa_req->f_len);
+ rc = rc || copy_to_user(cop->crk_param[6].crp_p, rsa_req->f, rsa_req->f_len);
} else {
if (rc != -EINPROGRESS && rc != 0)
goto err;
@@ -633,14 +623,15 @@ int crypto_bn_modexp(struct cryptodev_pkc *pkc)
rsa_req->f = rsa_req->e + rsa_req->e_len;
rsa_req->g = rsa_req->f + rsa_req->f_len;
rsa_req->n = rsa_req->g + rsa_req->g_len;
- copy_from_user(rsa_req->f, cop->crk_param[0].crp_p, rsa_req->f_len);
- copy_from_user(rsa_req->e, cop->crk_param[1].crp_p, rsa_req->e_len);
- copy_from_user(rsa_req->n, cop->crk_param[2].crp_p, rsa_req->n_len);
+ rc = copy_from_user(rsa_req->f, cop->crk_param[0].crp_p, rsa_req->f_len) ||
+ copy_from_user(rsa_req->e, cop->crk_param[1].crp_p, rsa_req->e_len) ||
+ copy_from_user(rsa_req->n, cop->crk_param[2].crp_p, rsa_req->n_len);
+ if (rc)
+ goto err;
+
rc = cryptodev_pkc_offload(pkc);
if (pkc->type == SYNCHRONOUS) {
- if (rc)
- goto err;
- copy_to_user(cop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
+ rc = rc || copy_to_user(cop->crk_param[3].crp_p, rsa_req->g, rsa_req->g_len);
} else {
if (rc != -EINPROGRESS && rc != 0)
goto err;
--
2.3.5
|
