diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-20 12:00:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-20 12:00:07 -0700 |
| commit | 55f058e7574c3615dea4615573a19bdb258696c6 (patch) | |
| tree | d61a76190d448f42a60e20a541b4808459f1b333 /arch/x86 | |
| parent | 9a0e3eea25d3ab267aff9d4eaed83fbe46d989d0 (diff) | |
| parent | f709b45ec461b548c41a00044dba1f1b572783bf (diff) | |
| download | linux-55f058e7574c3615dea4615573a19bdb258696c6.tar.gz linux-55f058e7574c3615dea4615573a19bdb258696c6.tar.bz2 linux-55f058e7574c3615dea4615573a19bdb258696c6.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 the following issues:
- Incorrect output buffer size calculation in rsa-pkcs1pad
- Uninitialised padding bytes on exported state in ccp driver
- Potentially freed pointer used on completion callback in sha1-mb"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ccp - Prevent information leakage on export
crypto: sha1-mb - use corrcet pointer while completing jobs
crypto: rsa-pkcs1pad - fix dst len
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/crypto/sha-mb/sha1_mb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c index a8a0224fa0f8..081255cea1ee 100644 --- a/arch/x86/crypto/sha-mb/sha1_mb.c +++ b/arch/x86/crypto/sha-mb/sha1_mb.c @@ -453,10 +453,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(); } } |