diff options
author | Cristian Stoica <cristian.stoica@nxp.com> | 2016-01-25 11:19:43 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-08-12 11:41:02 -0300 |
commit | b8e3085e4e9608b301121c7065c84a3e51b94c74 (patch) | |
tree | 27dd6761bb8a8b9a3ce311bab1155a15badaec5e /recipes-kernel/cryptodev/files/0015-fix-pkc-request-deallocation.patch | |
parent | 578ab5d071729c9677d928467a2b48bcb0017139 (diff) | |
download | meta-freescale-b8e3085e4e9608b301121c7065c84a3e51b94c74.tar.gz |
cryptodev-qoriq: upgrade to 1.8 plus fsl patches
upstream commit: 87b56e04b24c6d4be145483477eff7d3153290e9
Also:
- move all fsl patches on top of cryptodev-1.8
- add CIOCHASH ioctl
- fix incorrect tests initializations
- modify yocto patches to match updated Makefiles
Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com>
Diffstat (limited to 'recipes-kernel/cryptodev/files/0015-fix-pkc-request-deallocation.patch')
-rw-r--r-- | recipes-kernel/cryptodev/files/0015-fix-pkc-request-deallocation.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes-kernel/cryptodev/files/0015-fix-pkc-request-deallocation.patch b/recipes-kernel/cryptodev/files/0015-fix-pkc-request-deallocation.patch deleted file mode 100644 index 949fe121..00000000 --- a/recipes-kernel/cryptodev/files/0015-fix-pkc-request-deallocation.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 8361f99c940fbe270fca2112dae3d97c9a5776d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Cristian Stoica <cristian.stoica@freescale.com> | ||
3 | Date: Mon, 23 Feb 2015 15:28:22 +0200 | ||
4 | Subject: [PATCH 15/15] fix pkc request deallocation | ||
5 | |||
6 | The request to be freed is actually pkc->req, and should be done inside | ||
7 | the fetch ioctl for ASYNC (this patch) and in crypt ioctl for SYNC | ||
8 | operations. | ||
9 | |||
10 | Change-Id: I6f046f2ebeae4cb513a419996ca96b52e37468ed | ||
11 | Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com> | ||
12 | Reviewed-on: http://git.am.freescale.net:8181/34224 | ||
13 | --- | ||
14 | ioctl.c | 3 +-- | ||
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/ioctl.c b/ioctl.c | ||
18 | index 797b73c..da3a842 100644 | ||
19 | --- a/ioctl.c | ||
20 | +++ b/ioctl.c | ||
21 | @@ -114,8 +114,6 @@ void cryptodev_complete_asym(struct crypto_async_request *req, int err) | ||
22 | /* wake for POLLIN */ | ||
23 | wake_up_interruptible(&pcr->user_waiter); | ||
24 | } | ||
25 | - | ||
26 | - kfree(req); | ||
27 | } | ||
28 | |||
29 | #define FILL_SG(sg, ptr, len) \ | ||
30 | @@ -1113,6 +1111,7 @@ cryptodev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg_) | ||
31 | cookie_list.cookie[i] = pkc->kop.kop.cookie; | ||
32 | cookie_list.status[i] = pkc->result.err; | ||
33 | } | ||
34 | + kfree(pkc->req); | ||
35 | kfree(pkc); | ||
36 | } else { | ||
37 | spin_unlock_bh(&pcr->completion_lock); | ||
38 | -- | ||
39 | 2.3.5 | ||
40 | |||