]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
crypto: fix af_alg_make_sg() conversion to iov_iter
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2015 03:55:45 +0000 (19:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Feb 2015 03:55:45 +0000 (19:55 -0800)
commit9399f0c51489ae8c16d6559b82a452fdc1895e91
treef99c8140dfb98082496ea2d457f9641ca8078daa
parentb0f9ca53cbb103e9240a29a974e0b6085e58f9f7
crypto: fix af_alg_make_sg() conversion to iov_iter

Commit 1d10eb2f156f ("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
crypto/algif_skcipher.c