aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/openssl/openssl-fsl/0023-cryptodev-clean-up-code-layout.patch
blob: 5ff1c5cace77dcae992909b1b2141a5b2945119c (plain)
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
From 4453b06b940fc03a0973cfd96f908e46cce61054 Mon Sep 17 00:00:00 2001
From: Cristian Stoica <cristian.stoica@freescale.com>
Date: Wed, 18 Feb 2015 10:39:46 +0200
Subject: [PATCH 23/26] cryptodev: clean-up code layout

This is just a refactoring that uses else branch to check for malloc failures

Change-Id: I6dc157af36d6ec51a4edfc82cf97fae2e7e83628
Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/34218
---
 crypto/engine/eng_cryptodev.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index dbc5989..dceb4f5 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -1745,30 +1745,28 @@ cryptodev_asym_async(struct crypt_kop *kop, int rlen, BIGNUM *r, int slen,
 	fd = *(int *)cookie->eng_handle;
 
 	eng_cookie = malloc(sizeof(struct cryptodev_cookie_s));
-
-	if (eng_cookie) {
-		memset(eng_cookie, 0, sizeof(struct cryptodev_cookie_s));
-		if (r) {
-			kop->crk_param[kop->crk_iparams].crp_p = calloc(rlen, sizeof(char));
-			if (!kop->crk_param[kop->crk_iparams].crp_p)
-				return -ENOMEM;
-			kop->crk_param[kop->crk_iparams].crp_nbits = rlen * 8;
-			kop->crk_oparams++;
-			eng_cookie->r = r;
-			eng_cookie->r_param = kop->crk_param[kop->crk_iparams];
-		}
-		if (s) {
-			kop->crk_param[kop->crk_iparams+1].crp_p = calloc(slen, sizeof(char));
-			if (!kop->crk_param[kop->crk_iparams+1].crp_p)
-				return -ENOMEM;
-			kop->crk_param[kop->crk_iparams+1].crp_nbits = slen * 8;
-			kop->crk_oparams++;
-			eng_cookie->s = s;
-			eng_cookie->s_param = kop->crk_param[kop->crk_iparams + 1];
-		}
-	} else
+	if (!eng_cookie)
 		return -ENOMEM;
 
+	memset(eng_cookie, 0, sizeof(struct cryptodev_cookie_s));
+	if (r) {
+		kop->crk_param[kop->crk_iparams].crp_p = calloc(rlen, sizeof(char));
+		if (!kop->crk_param[kop->crk_iparams].crp_p)
+			return -ENOMEM;
+		kop->crk_param[kop->crk_iparams].crp_nbits = rlen * 8;
+		kop->crk_oparams++;
+		eng_cookie->r = r;
+		eng_cookie->r_param = kop->crk_param[kop->crk_iparams];
+	}
+	if (s) {
+		kop->crk_param[kop->crk_iparams+1].crp_p = calloc(slen, sizeof(char));
+		if (!kop->crk_param[kop->crk_iparams+1].crp_p)
+			return -ENOMEM;
+		kop->crk_param[kop->crk_iparams+1].crp_nbits = slen * 8;
+		kop->crk_oparams++;
+		eng_cookie->s = s;
+		eng_cookie->s_param = kop->crk_param[kop->crk_iparams + 1];
+	}
 	eng_cookie->kop = kop;
 	cookie->eng_cookie = eng_cookie;
 	return ioctl(fd, CIOCASYMASYNCRYPT, kop);
-- 
2.3.5