crypto: algif_skcipher - Load TX SG list after waiting
We need to load the TX SG list in sendmsg(2) after waiting for incoming data, not before. Cc: stable@vger.kernel.org Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Tested-by: Dmitry Vyukov <dvyukov@google.com>
This commit is contained in:
Родитель
e31835ad3a
Коммит
4f0414e54e
|
@ -647,13 +647,6 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg,
|
||||||
|
|
||||||
lock_sock(sk);
|
lock_sock(sk);
|
||||||
while (msg_data_left(msg)) {
|
while (msg_data_left(msg)) {
|
||||||
sgl = list_first_entry(&ctx->tsgl,
|
|
||||||
struct skcipher_sg_list, list);
|
|
||||||
sg = sgl->sg;
|
|
||||||
|
|
||||||
while (!sg->length)
|
|
||||||
sg++;
|
|
||||||
|
|
||||||
if (!ctx->used) {
|
if (!ctx->used) {
|
||||||
err = skcipher_wait_for_data(sk, flags);
|
err = skcipher_wait_for_data(sk, flags);
|
||||||
if (err)
|
if (err)
|
||||||
|
@ -674,6 +667,13 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg,
|
||||||
if (!used)
|
if (!used)
|
||||||
goto free;
|
goto free;
|
||||||
|
|
||||||
|
sgl = list_first_entry(&ctx->tsgl,
|
||||||
|
struct skcipher_sg_list, list);
|
||||||
|
sg = sgl->sg;
|
||||||
|
|
||||||
|
while (!sg->length)
|
||||||
|
sg++;
|
||||||
|
|
||||||
skcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used,
|
skcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used,
|
||||||
ctx->iv);
|
ctx->iv);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче