diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /crypto/ablkcipher.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'crypto/ablkcipher.c')
| -rw-r--r-- | crypto/ablkcipher.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c index a854df2a5a4b..fdc67d38660b 100644 --- a/crypto/ablkcipher.c +++ b/crypto/ablkcipher.c | |||
| @@ -141,8 +141,7 @@ err: | |||
| 141 | 141 | ||
| 142 | if (walk->iv != req->info) | 142 | if (walk->iv != req->info) |
| 143 | memcpy(req->info, walk->iv, tfm->crt_ablkcipher.ivsize); | 143 | memcpy(req->info, walk->iv, tfm->crt_ablkcipher.ivsize); |
| 144 | if (walk->iv_buffer) | 144 | kfree(walk->iv_buffer); |
| 145 | kfree(walk->iv_buffer); | ||
| 146 | 145 | ||
| 147 | return err; | 146 | return err; |
| 148 | } | 147 | } |