new file mode 100644

@@ -0,0 +1,127 @@

+From 48e775c9449017499b113ff6af45dd6ddf5e0aac Mon Sep 17 00:00:00 2001

+From: "Srivatsa S. Bhat" <srivatsa@csail.mit.edu>

+Date: Wed, 27 Jun 2018 13:11:40 -0700

+Subject: [PATCH] hwrng: rdrand - Add RNG driver based on x86 rdrand

+ instruction

+

+Add a Hardware Random Number Generator driver, which uses the

+'rdrand' instruction available on modern Intel and AMD CPUs.

+

+This can be used to feed the kernel's entropy pool on

+entropy-starved virtual machines.

+

+Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

+---

+ drivers/char/hw_random/Kconfig      | 14 +++++++++

+ drivers/char/hw_random/Makefile     |  1 +

+ drivers/char/hw_random/rdrand-rng.c | 61 +++++++++++++++++++++++++++++++++++++

+ 3 files changed, 76 insertions(+)

+ create mode 100644 drivers/char/hw_random/rdrand-rng.c

+

+diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig

+index 200dab5..cc3a67d 100644

+--- a/drivers/char/hw_random/Kconfig

+@@ -62,6 +62,20 @@ config HW_RANDOM_AMD

+ 

+ 	  If unsure, say Y.

+ 

++config HW_RANDOM_RDRAND

++	tristate "x86 rdrand Random Number Generator support"

++	depends on (X86_32 || X86_64) && ARCH_RANDOM

++	default HW_RANDOM

++	---help---

++	  This driver provides kernel-side support for a Random Number

++	  Generator that uses the 'rdrand' instruction on modern Intel

++	  and AMD CPUs.

++

++	  To compile this driver as a module, choose M here: the

++	  module will be called rdrand-rng.

++

++	  If unsure, say N.

++

+ config HW_RANDOM_ATMEL

+ 	tristate "Atmel Random Number Generator support"

+ 	depends on ARCH_AT91 && HAVE_CLK && OF

+diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile

+index 5f52b1e..5b92c8e 100644

+--- a/drivers/char/hw_random/Makefile

+@@ -7,6 +7,7 @@ rng-core-y := core.o

+ obj-$(CONFIG_HW_RANDOM_TIMERIOMEM) += timeriomem-rng.o

+ obj-$(CONFIG_HW_RANDOM_INTEL) += intel-rng.o

+ obj-$(CONFIG_HW_RANDOM_AMD) += amd-rng.o

++obj-$(CONFIG_HW_RANDOM_RDRAND) += rdrand-rng.o

+ obj-$(CONFIG_HW_RANDOM_ATMEL) += atmel-rng.o

+ obj-$(CONFIG_HW_RANDOM_BCM63XX)	+= bcm63xx-rng.o

+ obj-$(CONFIG_HW_RANDOM_GEODE) += geode-rng.o

+diff --git a/drivers/char/hw_random/rdrand-rng.c b/drivers/char/hw_random/rdrand-rng.c

+new file mode 100644

+index 0000000..e1cf7f3

+--- /dev/null

+@@ -0,0 +1,61 @@

++// SPDX-License-Identifier: GPL-2.0

++/*

++ * RNG driver that uses the 'rdrand' instruction (found on modern

++ * Intel and AMD CPUs).

++ *

++ * Author: Srivatsa S. Bhat <srivatsa@csail.mit.edu>

++ *

++ */

++

++#include <linux/hw_random.h>

++#include <linux/kernel.h>

++#include <linux/module.h>

++#include <asm/archrandom.h>

++

++#define PFX	KBUILD_MODNAME ": "

++

++static int rdrand_rng_read(struct hwrng *rng, void *buf, size_t max, bool wait)

++{

++	unsigned long *data = buf;

++	size_t read = 0;

++

++	while (read < max) {

++		arch_get_random_long(data);

++		data++;

++		read += sizeof(unsigned long);

++	}

++

++	return read;

++}

++

++static struct hwrng rdrand_rng = {

++	.name		= KBUILD_MODNAME,

++	.quality	= 1000,

++	.read		= rdrand_rng_read,

++};

++

++static int __init mod_init(void)

++{

++	int err = -ENODEV;

++

++	if (!arch_has_random())

++		return err; /* rdrand not available. */

++

++	err = hwrng_register(&rdrand_rng);

++	if (err)

++		pr_err(PFX "RNG registration failed (%d)\n", err);

++

++	return err;

++}

++

++static void __exit mod_exit(void)

++{

++	hwrng_unregister(&rdrand_rng);

++}

++

++module_init(mod_init);

++module_exit(mod_exit);

++

++MODULE_AUTHOR("Srivatsa S. Bhat <srivatsa@csail.mit.edu>");

++MODULE_DESCRIPTION("H/W RNG driver for x86 CPUs that support rdrand");

++MODULE_LICENSE("GPL");

+-- 

+2.7.4

+

@@ -2400,6 +2400,7 @@ CONFIG_HW_RANDOM=m

 CONFIG_HW_RANDOM_TIMERIOMEM=m

 CONFIG_HW_RANDOM_INTEL=m

 CONFIG_HW_RANDOM_AMD=m

+CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_HW_RANDOM_TPM=m

@@ -2226,6 +2226,7 @@ CONFIG_HW_RANDOM=m

 # CONFIG_HW_RANDOM_TIMERIOMEM is not set

 CONFIG_HW_RANDOM_INTEL=m

 CONFIG_HW_RANDOM_AMD=m

+CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_HW_RANDOM_TPM=m

@@ -1865,7 +1865,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y

 # CONFIG_SERIAL_FSL_LPUART is not set

 # CONFIG_TTY_PRINTK is not set

 # CONFIG_IPMI_HANDLER is not set

-# CONFIG_HW_RANDOM is not set

+CONFIG_HW_RANDOM=m

+# CONFIG_HW_RANDOM_TIMERIOMEM is not set

+# CONFIG_HW_RANDOM_INTEL is not set

+# CONFIG_HW_RANDOM_AMD is not set

+CONFIG_HW_RANDOM_RDRAND=m

+# CONFIG_HW_RANDOM_VIA is not set

 # CONFIG_NVRAM is not set

 # CONFIG_R3964 is not set

 # CONFIG_APPLICOM is not set

@@ -2474,6 +2479,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m

 # CONFIG_USB_HSIC_USB3503 is not set

 # CONFIG_USB_HSIC_USB4604 is not set

 # CONFIG_USB_LINK_LAYER_TEST is not set

+# CONFIG_USB_CHAOSKEY is not set

 # CONFIG_UCSI is not set

 #

@@ -2361,6 +2361,7 @@ CONFIG_HW_RANDOM=m

 CONFIG_HW_RANDOM_TIMERIOMEM=m

 CONFIG_HW_RANDOM_INTEL=m

 CONFIG_HW_RANDOM_AMD=m

+CONFIG_HW_RANDOM_RDRAND=m

 CONFIG_HW_RANDOM_VIA=m

 CONFIG_HW_RANDOM_VIRTIO=m

 CONFIG_HW_RANDOM_TPM=m

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-aws

 Version:        4.9.109

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -58,6 +58,7 @@ Patch38:        0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch

 Patch40:        0001-f2fs-fix-a-panic-caused-by-NULL-flush_cmd_control.patch

 # Fix for CVE-2017-18224

 Patch41:        0001-ocfs2-ip_alloc_sem-should-be-taken-in-ocfs2_get_bloc.patch

+Patch42:        0001-hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

@@ -229,6 +230,7 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch38 -p1

 %patch40 -p1

 %patch41 -p1

+%patch42 -p1

 %patch52 -p1

 %patch53 -p1

@@ -449,6 +451,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2

+-   Add rdrand-based RNG driver to enhance kernel entropy.

 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1

 -   Update to version 4.9.109

 *   Mon May 21 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.101-2

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.9.109

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -55,6 +55,7 @@ Patch38:        0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch

 Patch40:        0001-f2fs-fix-a-panic-caused-by-NULL-flush_cmd_control.patch

 # Fix for CVE-2017-18224

 Patch41:        0001-ocfs2-ip_alloc_sem-should-be-taken-in-ocfs2_get_bloc.patch

+Patch42:        0001-hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

@@ -144,6 +145,7 @@ The Linux package contains the Linux kernel doc files

 %patch38 -p1

 %patch40 -p1

 %patch41 -p1

+%patch42 -p1

 %patch52 -p1

 %patch53 -p1

@@ -256,6 +258,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-3

+-   Add rdrand-based RNG driver to enhance kernel entropy.

 *   Mon Jun 25 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2

 -   Enable USB_SERIAL support in the config.

 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.9.109

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -64,6 +64,7 @@ Patch40:        0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch

 Patch42:        0001-f2fs-fix-a-panic-caused-by-NULL-flush_cmd_control.patch

 # Fix for CVE-2017-18224

 Patch43:        0001-ocfs2-ip_alloc_sem-should-be-taken-in-ocfs2_get_bloc.patch

+Patch44:        0001-hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

@@ -197,6 +198,7 @@ EOF

 %patch40 -p1

 %patch42 -p1

 %patch43 -p1

+%patch44 -p1

 # spectre

 %patch52 -p1

@@ -344,6 +346,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2

+-   Add rdrand-based RNG driver to enhance kernel entropy.

 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1

 -   Update to version 4.9.109

 *   Mon May 21 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.101-2

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.9.109

-Release:        1%{?kat_build:.%kat_build}%{?dist}

+Release:        2%{?kat_build:.%kat_build}%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -62,6 +62,7 @@ Patch38:        0001-net-phy-mdio-bcm-unimac-fix-potential-NULL-dereferen.patch

 Patch40:        0001-f2fs-fix-a-panic-caused-by-NULL-flush_cmd_control.patch

 # Fix for CVE-2017-18224

 Patch41:        0001-ocfs2-ip_alloc_sem-should-be-taken-in-ocfs2_get_bloc.patch

+Patch42:        0001-hwrng-rdrand-Add-RNG-driver-based-on-x86-rdrand-inst.patch

 # For Spectre

 Patch52: 0141-locking-barriers-introduce-new-observable-speculatio.patch

@@ -188,6 +189,7 @@ This package contains the 'perf' performance analysis tools for Linux kernel.

 %patch38 -p1

 %patch40 -p1

 %patch41 -p1

+%patch42 -p1

 %patch52 -p1

 %patch53 -p1

@@ -371,6 +373,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-2

+-   Add rdrand-based RNG driver to enhance kernel entropy.

 *   Thu Jun 21 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.109-1

 -   Update to version 4.9.109

 *   Mon May 21 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.101-2

new file mode 100644

@@ -0,0 +1,2 @@

+# Automatically load the following kernel modules on every boot.

+rdrand-rng

@@ -1,7 +1,7 @@

 Summary:          Systemd-233

 Name:             systemd

 Version:          233

-Release:          13%{?dist}

+Release:          14%{?dist}

 License:          LGPLv2+ and GPLv2+ and MIT

 URL:              http://www.freedesktop.org/wiki/Software/systemd/

 Group:            System Environment/Security

@@ -13,6 +13,7 @@ Source1:          99-vmware-hotplug.rules

 Source2:          50-security-hardening.conf

 Source3:          systemd.cfg

 Source4:          99-dhcp-en.network

+Source5:          10-rdrand-rng.conf

 Patch0:           01-enoX-uses-instance-number-for-vmware-hv.patch

 Patch1:           02-install-general-aliases.patch

@@ -151,6 +152,7 @@ rm %{buildroot}/lib/systemd/system/default.target

 ln -sfv multi-user.target %{buildroot}/lib/systemd/system/default.target

 install -dm 0755 %{buildroot}/%{_sysconfdir}/systemd/network

 install -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/systemd/network

+install -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/modules-load.d

 %find_lang %{name}

 %post

@@ -196,6 +198,7 @@ rm -rf %{buildroot}/*

 %dir %{_sysconfdir}/udev/hwdb.d

 %{_sysconfdir}/udev/rules.d/99-vmware-hotplug.rules

 %config(noreplace) %{_sysconfdir}/udev/udev.conf

+%config(noreplace) %{_sysconfdir}/modules-load.d/10-rdrand-rng.conf

 %config(noreplace) /boot/systemd.cfg

 %{_sysconfdir}/systemd/system/*

 /lib/udev/*

@@ -247,6 +250,8 @@ rm -rf %{buildroot}/*

 %files lang -f %{name}.lang

 %changelog

+*    Wed Jun 27 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu>  233-14

+-    Automatically load rdrand-rng kernel module on every boot.

 *    Wed Apr 11 2018 Xiaolin Li <xiaolinl@vmware.com>  233-13

 -    Build systemd with util-linux 2.32.

 *    Wed Mar 14 2018 Xiaolin Li <xiaolinl@vmware.com>  233-12