Merge: crypto: rng - Fix extrng EFAULT handling

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6000

JIRA: https://issues.redhat.com/browse/RHEL-68420
Upstream Status: RHEL only

When the iov_iter change was added the EFAULT handling became
broken.  Fix it by checking that copy_to_iter copied the correct
number of bytes.

Also make sure that a failure in crypto_rng_get_bytes does not
cause previous bytes to be discarded.

Finally update the scheduling code per get_random_bytes_user.

Signed-off-by: Herbert Xu <herbert.xu@redhat.com>

Approved-by: Vladis Dronov <vdronov@redhat.com>
Approved-by: Phil Auld <pauld@redhat.com>
Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com>

Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>

Author: emmil

crypto/rng.c

@@ -295,20 +295,21 @@ static ssize_t crypto_devrandom_read_iter(struct iov_iter *iter, bool reseed)
 		i = min_t(size_t, iov_iter_count(iter), sizeof(tmp));
 		err = crypto_rng_get_bytes(rng, tmp, i);
 		if (err) {
-			ret = err;
+			ret = ret ?: err;
 			break;
 		}
 
 		copied = copy_to_iter(tmp, i, iter);
 		ret += copied;
 
-		if (!iov_iter_count(iter) || copied != sizeof(tmp))
+		if (!iov_iter_count(iter) || copied != i)
 			break;
 
-		if (need_resched()) {
+		BUILD_BUG_ON(PAGE_SIZE % sizeof(tmp) != 0);
+		if (ret % PAGE_SIZE == 0) {
 			if (signal_pending(current))
 				break;
-			schedule();
+			cond_resched();
 		}
 	}
 
@@ -317,8 +318,7 @@ static ssize_t crypto_devrandom_read_iter(struct iov_iter *iter, bool reseed)
 	else
 		crypto_put_default_rng();
 	memzero_explicit(tmp, sizeof(tmp));
-
-	return ret;
+	return ret ? ret : -EFAULT;
 }
 
 static const struct random_extrng crypto_devrandom_rng = {