diff --git a/gitrev b/gitrev index 4f2f8bac8..61f53cc44 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -6edc51a8d43b0bb8263fefaa8eb0cf62e8499978 +9fe68cad6e74967b88d0c6aeca7d9cd6b6e91942 diff --git a/kernel.spec b/kernel.spec index fc4ead9e9..558855383 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 2 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -606,9 +606,6 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch #ongoing complaint, full discussion delayed until ksummit/plumbers Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch -#rhbz 1383451 -Patch850: resend-4.9-hw_random-Don-t-use-a-stack-buffer-in-add_early_randomness.patch - # END OF PATCH DEFINITIONS %endif @@ -2147,6 +2144,9 @@ fi # # %changelog +* Tue Oct 25 2016 Laura Abbott - 4.9.0-0.rc2.git1.1 +- Linux v4.9-rc2-40-g9fe68ca + * Tue Oct 25 2016 Laura Abbott - Reenable debugging options. diff --git a/resend-4.9-hw_random-Don-t-use-a-stack-buffer-in-add_early_randomness.patch b/resend-4.9-hw_random-Don-t-use-a-stack-buffer-in-add_early_randomness.patch deleted file mode 100644 index b3e4f8d9d..000000000 --- a/resend-4.9-hw_random-Don-t-use-a-stack-buffer-in-add_early_randomness.patch +++ /dev/null @@ -1,56 +0,0 @@ -From patchwork Mon Oct 17 17:06:27 2016 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [resend, - 4.9] hw_random: Don't use a stack buffer in add_early_randomness() -From: Andrew Lutomirski -X-Patchwork-Id: 9380037 -Message-Id: <4169224b6858d1cf149f1a73f8a03603fa19076d.1476638125.git.luto@kernel.org> -To: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, - Matt Mackall , Herbert Xu , - Rusty Russell -Cc: Jens Axboe , Matt Mullins , - Andy Lutomirski -Date: Mon, 17 Oct 2016 10:06:27 -0700 - -hw_random carefully avoids using a stack buffer except in -add_early_randomness(). This causes a crash in virtio_rng if -CONFIG_VMAP_STACK=y. - -Reported-by: Matt Mullins -Tested-by: Matt Mullins -Fixes: d3cc7996473a ("hwrng: fetch randomness only after device init") -Signed-off-by: Andy Lutomirski ---- - -This fixes a crash in 4.9-rc1. - -resending because I typoed the git send-email command. I stealthily added -Matt's Tested-by, too. - - drivers/char/hw_random/core.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c -index 9203f2d130c0..340f96e44642 100644 ---- a/drivers/char/hw_random/core.c -+++ b/drivers/char/hw_random/core.c -@@ -84,14 +84,14 @@ static size_t rng_buffer_size(void) - - static void add_early_randomness(struct hwrng *rng) - { -- unsigned char bytes[16]; - int bytes_read; -+ size_t size = min_t(size_t, 16, rng_buffer_size()); - - mutex_lock(&reading_mutex); -- bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1); -+ bytes_read = rng_get_data(rng, rng_buffer, size, 1); - mutex_unlock(&reading_mutex); - if (bytes_read > 0) -- add_device_randomness(bytes, bytes_read); -+ add_device_randomness(rng_buffer, bytes_read); - } - - static inline void cleanup_rng(struct kref *kref) diff --git a/sources b/sources index 21e1b80ac..8ff2e78e0 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz 0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz ad6f2f144892a36b6d91cbe63c7e042d patch-4.9-rc2.xz +e354bf4a3f421fcef9d4513e508a7ce4 patch-4.9-rc2-git1.xz