summaryrefslogtreecommitdiffstats
path: root/patch-5.14.0-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.14.0-redhat.patch')
-rw-r--r--patch-5.14.0-redhat.patch310
1 files changed, 309 insertions, 1 deletions
diff --git a/patch-5.14.0-redhat.patch b/patch-5.14.0-redhat.patch
index 1a2ce2501..c7f6e5b5e 100644
--- a/patch-5.14.0-redhat.patch
+++ b/patch-5.14.0-redhat.patch
@@ -10,12 +10,14 @@
arch/s390/kernel/setup.c | 4 +
arch/x86/kernel/cpu/common.c | 1 +
arch/x86/kernel/setup.c | 69 ++-
+ crypto/rng.c | 73 ++-
drivers/acpi/apei/hest.c | 8 +
drivers/acpi/irq.c | 17 +-
drivers/acpi/scan.c | 9 +
drivers/ata/libahci.c | 18 +
drivers/char/ipmi/ipmi_dmi.c | 15 +
drivers/char/ipmi/ipmi_msghandler.c | 16 +-
+ drivers/char/random.c | 115 +++++
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi.c | 124 +++--
drivers/firmware/efi/secureboot.c | 38 ++
@@ -49,6 +51,7 @@
include/linux/module.h | 1 +
include/linux/panic.h | 19 +-
include/linux/pci.h | 4 +
+ include/linux/random.h | 7 +
include/linux/rh_kabi.h | 297 +++++++++++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
@@ -80,7 +83,7 @@
tools/testing/selftests/bpf/progs/linked_maps2.c | 76 ---
tools/testing/selftests/bpf/progs/linked_vars1.c | 54 --
tools/testing/selftests/bpf/progs/linked_vars2.c | 55 ---
- 82 files changed, 1154 insertions(+), 1492 deletions(-)
+ 85 files changed, 1348 insertions(+), 1493 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index bdb22006f713..61a3a4a4730b 100644
@@ -392,6 +395,103 @@ index bff3a784aec5..1a9c345f914d 100644
unwind_init();
}
+diff --git a/crypto/rng.c b/crypto/rng.c
+index fea082b25fe4..50a9d040bed1 100644
+--- a/crypto/rng.c
++++ b/crypto/rng.c
+@@ -11,14 +11,17 @@
+ #include <linux/atomic.h>
+ #include <crypto/internal/rng.h>
+ #include <linux/err.h>
++#include <linux/fips.h>
++#include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/mutex.h>
+ #include <linux/random.h>
+ #include <linux/seq_file.h>
++#include <linux/sched.h>
++#include <linux/sched/signal.h>
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/cryptouser.h>
+-#include <linux/compiler.h>
+ #include <net/netlink.h>
+
+ #include "internal.h"
+@@ -224,5 +227,73 @@ void crypto_unregister_rngs(struct rng_alg *algs, int count)
+ }
+ EXPORT_SYMBOL_GPL(crypto_unregister_rngs);
+
++static ssize_t crypto_devrandom_read(void __user *buf, size_t buflen)
++{
++ u8 tmp[256];
++ ssize_t ret;
++
++ if (!buflen)
++ return 0;
++
++ ret = crypto_get_default_rng();
++ if (ret)
++ return ret;
++
++ for (;;) {
++ int err;
++ int i;
++
++ i = min_t(int, buflen, sizeof(tmp));
++ err = crypto_rng_get_bytes(crypto_default_rng, tmp, i);
++ if (err) {
++ ret = err;
++ break;
++ }
++
++ if (copy_to_user(buf, tmp, i)) {
++ ret = -EFAULT;
++ break;
++ }
++
++ buflen -= i;
++ buf += i;
++ ret += i;
++
++ if (!buflen)
++ break;
++
++ if (need_resched()) {
++ if (signal_pending(current))
++ break;
++ schedule();
++ }
++ }
++
++ crypto_put_default_rng();
++ memzero_explicit(tmp, sizeof(tmp));
++
++ return ret;
++}
++
++static const struct random_extrng crypto_devrandom_rng = {
++ .extrng_read = crypto_devrandom_read,
++ .owner = THIS_MODULE,
++};
++
++static int __init crypto_rng_init(void)
++{
++ if (fips_enabled)
++ random_register_extrng(&crypto_devrandom_rng);
++ return 0;
++}
++
++static void __exit crypto_rng_exit(void)
++{
++ random_unregister_extrng();
++}
++
++late_initcall(crypto_rng_init);
++module_exit(crypto_rng_exit);
++
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("Random Number Generator");
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 277f00b288d1..adbce15c273d 100644
--- a/drivers/acpi/apei/hest.c
@@ -564,6 +664,189 @@ index e96cb5c4f97a..d645460fe8a9 100644
mutex_lock(&ipmi_interfaces_mutex);
rv = ipmi_register_driver();
mutex_unlock(&ipmi_interfaces_mutex);
+diff --git a/drivers/char/random.c b/drivers/char/random.c
+index 605969ed0f96..4d51f1c67675 100644
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -335,6 +335,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/completion.h>
+ #include <linux/uuid.h>
++#include <linux/rcupdate.h>
+ #include <crypto/chacha.h>
+ #include <crypto/sha1.h>
+
+@@ -349,6 +350,11 @@
+
+ /* #define ADD_INTERRUPT_BENCH */
+
++/*
++ * Hook for external RNG.
++ */
++static const struct random_extrng __rcu *extrng;
++
+ /*
+ * Configuration information
+ */
+@@ -481,6 +487,9 @@ static int ratelimit_disable __read_mostly;
+ module_param_named(ratelimit_disable, ratelimit_disable, int, 0644);
+ MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression");
+
++static const struct file_operations extrng_random_fops;
++static const struct file_operations extrng_urandom_fops;
++
+ /**********************************************************************
+ *
+ * OS independent entropy store. Here are the functions which handle
+@@ -1858,6 +1867,13 @@ random_poll(struct file *file, poll_table * wait)
+ return mask;
+ }
+
++static __poll_t
++extrng_poll(struct file *file, poll_table * wait)
++{
++ /* extrng pool is always full, always read, no writes */
++ return EPOLLIN | EPOLLRDNORM;
++}
++
+ static int
+ write_pool(struct entropy_store *r, const char __user *buffer, size_t count)
+ {
+@@ -1961,7 +1977,58 @@ static int random_fasync(int fd, struct file *filp, int on)
+ return fasync_helper(fd, filp, on, &fasync);
+ }
+
++static int random_open(struct inode *inode, struct file *filp)
++{
++ const struct random_extrng *rng;
++
++ rcu_read_lock();
++ rng = rcu_dereference(extrng);
++ if (rng && !try_module_get(rng->owner))
++ rng = NULL;
++ rcu_read_unlock();
++
++ if (!rng)
++ return 0;
++
++ filp->f_op = &extrng_random_fops;
++ filp->private_data = rng->owner;
++
++ return 0;
++}
++
++static int urandom_open(struct inode *inode, struct file *filp)
++{
++ const struct random_extrng *rng;
++
++ rcu_read_lock();
++ rng = rcu_dereference(extrng);
++ if (rng && !try_module_get(rng->owner))
++ rng = NULL;
++ rcu_read_unlock();
++
++ if (!rng)
++ return 0;
++
++ filp->f_op = &extrng_urandom_fops;
++ filp->private_data = rng->owner;
++
++ return 0;
++}
++
++static int extrng_release(struct inode *inode, struct file *filp)
++{
++ module_put(filp->private_data);
++ return 0;
++}
++
++static ssize_t
++extrng_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
++{
++ return rcu_dereference_raw(extrng)->extrng_read(buf, nbytes);
++}
++
+ const struct file_operations random_fops = {
++ .open = random_open,
+ .read = random_read,
+ .write = random_write,
+ .poll = random_poll,
+@@ -1972,6 +2039,7 @@ const struct file_operations random_fops = {
+ };
+
+ const struct file_operations urandom_fops = {
++ .open = urandom_open,
+ .read = urandom_read,
+ .write = random_write,
+ .unlocked_ioctl = random_ioctl,
+@@ -1980,9 +2048,31 @@ const struct file_operations urandom_fops = {
+ .llseek = noop_llseek,
+ };
+
++static const struct file_operations extrng_random_fops = {
++ .open = random_open,
++ .read = extrng_read,
++ .write = random_write,
++ .poll = extrng_poll,
++ .unlocked_ioctl = random_ioctl,
++ .fasync = random_fasync,
++ .llseek = noop_llseek,
++ .release = extrng_release,
++};
++
++static const struct file_operations extrng_urandom_fops = {
++ .open = urandom_open,
++ .read = extrng_read,
++ .write = random_write,
++ .unlocked_ioctl = random_ioctl,
++ .fasync = random_fasync,
++ .llseek = noop_llseek,
++ .release = extrng_release,
++};
++
+ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
+ unsigned int, flags)
+ {
++ const struct random_extrng *rng;
+ int ret;
+
+ if (flags & ~(GRND_NONBLOCK|GRND_RANDOM|GRND_INSECURE))
+@@ -1998,6 +2088,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count,
+ if (count > INT_MAX)
+ count = INT_MAX;
+
++ rcu_read_lock();
++ rng = rcu_dereference(extrng);
++ if (rng && !try_module_get(rng->owner))
++ rng = NULL;
++ rcu_read_unlock();
++
++ if (rng) {
++ ret = rng->extrng_read(buf, count);
++ module_put(rng->owner);
++ return ret;
++ }
++
+ if (!(flags & GRND_INSECURE) && !crng_ready()) {
+ if (flags & GRND_NONBLOCK)
+ return -EAGAIN;
+@@ -2303,3 +2405,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
+ add_device_randomness(buf, size);
+ }
+ EXPORT_SYMBOL_GPL(add_bootloader_randomness);
++
++void random_register_extrng(const struct random_extrng *rng)
++{
++ rcu_assign_pointer(extrng, rng);
++}
++EXPORT_SYMBOL_GPL(random_register_extrng);
++
++void random_unregister_extrng(void)
++{
++ RCU_INIT_POINTER(extrng, NULL);
++ synchronize_rcu();
++}
++EXPORT_SYMBOL_GPL(random_unregister_extrng);
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index 467e94259679..9b6f5b8e5397 100644
--- a/drivers/firmware/efi/Makefile
@@ -1939,6 +2222,31 @@ index 540b377ca8f6..eb21f6dfb846 100644
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
int pass);
+diff --git a/include/linux/random.h b/include/linux/random.h
+index f45b8be3e3c4..7ccdec68b789 100644
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -14,6 +14,11 @@
+
+ #include <uapi/linux/random.h>
+
++struct random_extrng {
++ ssize_t (*extrng_read)(void __user *buf, size_t buflen);
++ struct module *owner;
++};
++
+ struct random_ready_callback {
+ struct list_head list;
+ void (*func)(struct random_ready_callback *rdy);
+@@ -44,6 +49,8 @@ extern bool rng_is_initialized(void);
+ extern int add_random_ready_callback(struct random_ready_callback *rdy);
+ extern void del_random_ready_callback(struct random_ready_callback *rdy);
+ extern int __must_check get_random_bytes_arch(void *buf, int nbytes);
++void random_register_extrng(const struct random_extrng *rng);
++void random_unregister_extrng(void);
+
+ #ifndef MODULE
+ extern const struct file_operations random_fops, urandom_fops;
diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
new file mode 100644
index 000000000000..ea9c136bf884
generated by cgit (git 2.34.1) at 2024-04-19 16:40:03 +0000