crypto: fix af_alg_make_sg() conversion to iov_iter (9399f0c5) · Commits · 戴 / test

Commit ("crypto: switch af_alg_make_sg() to iov_iter") broke af_alg_make_sg() and skcipher_recvmsg() in the process of moving them to the iov_iter interfaces. The 'npages' calculation in the formar calculated the number of *bytes* in the pages, and in the latter case the conversion didn't re-read the value of 'ctx->used' after waiting for it to become non-zero. This reverts to the original code for both these cases. Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: David Miller <davem@davemloft.net> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

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 = PAGE_ALIGN(off + n);
		npages = (off + n + PAGE_SIZE - 1) >> PAGE_SHIFT;
		if (WARN_ON(npages == 0))
		return -EINVAL;

crypto/algif_skcipher.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -439,14 +439,13 @@ static int skcipher_recvmsg(struct kiocb unused, struct socket sock,
		while (!sg->length)
		sg++;

		used = ctx->used;
		if (!used) {
		if (!ctx->used) {
		err = skcipher_wait_for_data(sk, flags);
		if (err)
		goto unlock;
		}

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

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

Admin message