Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e09dcd2e authored by David S. Miller's avatar David S. Miller
Browse files

Revert "crypto: Fix regressions caused by iov_iter changes." 



This reverts commit 750d8065.

Linus already fixed this in his tree so just use what
he did.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 750d8065

crypto/af_alg.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len) 
	if (n < 0)

		return n;



	npages = DIV_ROUND_UP(off + n, PAGE_SIZE);

	npages = PAGE_ALIGN(off + n);

	if (WARN_ON(npages == 0))

		return -EINVAL;

crypto/algif_skcipher.c

+4 −3
Original line number Diff line number Diff line
@@ -427,11 +427,11 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, 
	struct skcipher_sg_list *sgl;

	struct scatterlist *sg;

	int err = -EAGAIN;

	int used;

	long copied = 0;



	lock_sock(sk);

	while (iov_iter_count(&msg->msg_iter)) {

		int used;

		sgl = list_first_entry(&ctx->tsgl,

				       struct skcipher_sg_list, list);

		sg = sgl->sg;
@@ -439,13 +439,14 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, 
		while (!sg->length)

			sg++;



		if (!ctx->used) {

		used = ctx->used;

		if (!used) {

			err = skcipher_wait_for_data(sk, flags);

			if (err)

				goto unlock;

		}



		used = min_t(unsigned long, ctx->used, iov_iter_count(&msg->msg_iter));

		used = min_t(unsigned long, used, iov_iter_count(&msg->msg_iter));



		used = af_alg_make_sg(&ctx->rsgl, &msg->msg_iter, used);

		err = used;