diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2020-07-02 13:32:21 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-21 13:05:31 +0200 |
| commit | aebe05a28d8c1dc92995dd0e26d3a4c75284fd06 (patch) | |
| tree | 36e12a38610a239a523de16cf80dd000644e3521 | |
| parent | 60259e04cf61df7c7696e7e9e3855488faf6638c (diff) | |
| download | linux-crypto-aebe05a28d8c1dc92995dd0e26d3a4c75284fd06.tar.gz linux-crypto-aebe05a28d8c1dc92995dd0e26d3a4c75284fd06.zip | |
crypto: af_alg - Fix regression on empty requests
[ Upstream commit 673136029221f5b7c0eea9efc9aabc1a081aa148 ]
Some user-space programs rely on crypto requests that have no
control metadata. This broke when a check was added to require
the presence of control metadata with the ctx->init flag.
This patch fixes the regression by setting ctx->init as long as
one sendmsg(2) has been made, with or without a control message.
Reported-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Fixes: a52eb0489f96 ("crypto: algif_aead - Only wake up when...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | crypto/af_alg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/af_alg.c b/crypto/af_alg.c index ed8ace86..35e026ba 100644 --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -851,6 +851,7 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, err = -EINVAL; goto unlock; } + ctx->init = true; if (init) { ctx->enc = enc; @@ -858,7 +859,6 @@ int af_alg_sendmsg(struct socket *sock, struct msghdr *msg, size_t size, memcpy(ctx->iv, con.iv->iv, ivsize); ctx->aead_assoclen = con.aead_assoclen; - ctx->init = true; } while (size) { |