[OS-BUILD PATCH] Fix up "random: Add hook to override device reads and getrandom(2)"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Andreas Gruenbacher <agruenba@xxxxxxxxxx>

Fix up "random: Add hook to override device reads and getrandom(2)"

RHEL-only commit 7c0b728ae37e7 ("random: Add hook to override device
reads and getrandom(2)") adds a call to import_single_range(), but that
function has been replaced by import_ubuf() and removed upstream:

    6ac805d138709 ("iov_iter: remove unused 'iov' argument from import_single_range()")
    9fd7874c0e5c8 ("iov_iter: replace import_single_range() with import_ubuf()")

Fix up commit 7c0b728ae37e7 to use import_ubuf() instead.

Fixes: 7c0b728ae37e7 ("random: Add hook to override device reads and getrandom(2)")
Signed-off-by: Andreas Gruenbacher <agruenba@xxxxxxxxxx>

diff --git a/drivers/char/random.c b/drivers/char/random.c
index blahblah..blahblah 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1406,7 +1406,7 @@ SYSCALL_DEFINE3(getrandom, char __user *, ubuf, size_t, len, unsigned int, flags
 	rcu_read_unlock();
 
 	if (rng) {
-		ret = import_single_range(ITER_DEST, ubuf, len, &iov, &iter);
+		ret = import_ubuf(ITER_DEST, ubuf, len, &iter);
 		if (unlikely(ret))
 			return ret;
 		ret = rng->extrng_read_iter(&iter, !!(flags & GRND_RANDOM));

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2857
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux