diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-23 14:29:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-23 14:29:00 -0400 |
| commit | d1fdafa10f80292ba31c2f45a3e94805873575a8 (patch) | |
| tree | 5ac8703baba18bc4e23cf8be7e97f8121d8fcfba /arch/x86/crypto/sha512-mb/sha512_mb.c | |
| parent | Merge tag 'arc-4.8-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (diff) | |
| parent | crypto: sha512-mb - fix ctx pointer (diff) | |
| download | linux-dev-d1fdafa10f80292ba31c2f45a3e94805873575a8.tar.xz linux-dev-d1fdafa10f80292ba31c2f45a3e94805873575a8.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a number of memory corruption bugs in the newly added
sha256-mb/sha256-mb code"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sha512-mb - fix ctx pointer
crypto: sha256-mb - fix ctx pointer and digest copy
Diffstat (limited to 'arch/x86/crypto/sha512-mb/sha512_mb.c')
| -rw-r--r-- | arch/x86/crypto/sha512-mb/sha512_mb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/sha512-mb/sha512_mb.c b/arch/x86/crypto/sha512-mb/sha512_mb.c index f4cf5b78fd36..d210174a52b0 100644 --- a/arch/x86/crypto/sha512-mb/sha512_mb.c +++ b/arch/x86/crypto/sha512-mb/sha512_mb.c @@ -497,10 +497,10 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx, req = cast_mcryptd_ctx_to_req(req_ctx); if (irqs_disabled()) - rctx->complete(&req->base, ret); + req_ctx->complete(&req->base, ret); else { local_bh_disable(); - rctx->complete(&req->base, ret); + req_ctx->complete(&req->base, ret); local_bh_enable(); } } |