diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:21:50 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:21:50 +0000 |
| commit | 6ae0a6e3c2e959d4b96c49e5d6aa475ed6932c43 (patch) | |
| tree | b35d197a144f4857ec29c2fd479721fd8d6677cb /crypto | |
| parent | 188eac302f18174c537f3142e103f75bcf9d8a6d (diff) | |
| parent | 4e9688ad3d36e8f73c73e435f53da5ae1cd91a70 (diff) | |
Merge tag 'v5.4.49' into 5.4-2.1.x-imx
This is the 5.4.49 stable release
Conflicts (manual resolve, NXP version taken):
sound/soc/fsl/fsl_esai.c
Commit 53057bd4ac84f upstream addresses the problem of endless isr in
case if exception interrupt is enabled and tasklet is scheduled. Since
NXP implementation has tasklet removed with commit 2bbe95fe6c0dd,
upstream fix does not match the main implementation, hence we keep the
NXP version here.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algboss.c | 2 | ||||
| -rw-r--r-- | crypto/algif_skcipher.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/crypto/algboss.c b/crypto/algboss.c index a62149d6c839..2d41e67532c0 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c @@ -188,8 +188,6 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval) if (IS_ERR(thread)) goto err_put_larval; - wait_for_completion_interruptible(&larval->completion); - return NOTIFY_STOP; err_put_larval: diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index e2c8ab408bed..4c3bdffe0c3a 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -74,14 +74,10 @@ static int _skcipher_recvmsg(struct socket *sock, struct msghdr *msg, return PTR_ERR(areq); /* convert iovecs of output buffers into RX SGL */ - err = af_alg_get_rsgl(sk, msg, flags, areq, -1, &len); + err = af_alg_get_rsgl(sk, msg, flags, areq, ctx->used, &len); if (err) goto free; - /* Process only as much RX buffers for which we have TX data */ - if (len > ctx->used) - len = ctx->used; - /* * If more buffers are to be expected to be processed, process only * full block size buffers. |