diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2020-07-02 13:32:21 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-07-09 18:25:22 +1000 |
| commit | 673136029221f5b7c0eea9efc9aabc1a081aa148 (patch) | |
| tree | c87b7a8d3f4b8259c6f19311f8f6e7434d9573b8 | |
| parent | a52eb0489f96f7318fce6b1afe1cabd46c750746 (diff) | |
| download | linux-crypto-673136029221f5b7c0eea9efc9aabc1a081aa148.tar.gz linux-crypto-673136029221f5b7c0eea9efc9aabc1a081aa148.zip | |
crypto: af_alg - Fix regression on empty requests
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>
| -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 9fcb91ea..5882ed46 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) { |