4.19-stable patches

added patches:
	random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch
	random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch

diff --git a/queue-4.19/random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch b/queue-4.19/random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch
new file mode 100644 (file)
index 0000000..efe3af7
--- /dev/null
+++ b/queue-4.19/random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch
@@ -0,0 +1,58 @@
+From 1c9df907da83812e4f33b59d3d142c864d9da57f Mon Sep 17 00:00:00 2001
+From: Willy Tarreau <w@1wt.eu>
+Date: Thu, 30 Jul 2020 07:59:24 +0200
+Subject: random: fix circular include dependency on arm64 after addition of percpu.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Willy Tarreau <w@1wt.eu>
+
+commit 1c9df907da83812e4f33b59d3d142c864d9da57f upstream.
+
+Daniel Díaz and Kees Cook independently reported that commit
+f227e3ec3b5c ("random32: update the net random state on interrupt and
+activity") broke arm64 due to a circular dependency on include files
+since the addition of percpu.h in random.h.
+
+The correct fix would definitely be to move all the prandom32 stuff out
+of random.h but for backporting, a smaller solution is preferred.
+
+This one replaces linux/percpu.h with asm/percpu.h, and this fixes the
+problem on x86_64, arm64, arm, and mips.  Note that moving percpu.h
+around didn't change anything and that removing it entirely broke
+differently.  When backporting, such options might still be considered
+if this patch fails to help.
+
+[ It turns out that an alternate fix seems to be to just remove the
+  troublesome <asm/pointer_auth.h> remove from the arm64 <asm/smp.h>
+  that causes the circular dependency.
+
+  But we might as well do the whole belt-and-suspenders thing, and
+  minimize inclusion in <linux/random.h> too. Either will fix the
+  problem, and both are good changes.   - Linus ]
+
+Reported-by: Daniel Díaz <daniel.diaz@linaro.org>
+Reported-by: Kees Cook <keescook@chromium.org>
+Tested-by: Marc Zyngier <maz@kernel.org>
+Fixes: f227e3ec3b5c
+Cc: Stephen Rothwell <sfr@canb.auug.org.au>
+Signed-off-by: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/random.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -9,7 +9,7 @@
+ 
+ #include <linux/list.h>
+ #include <linux/once.h>
+-#include <linux/percpu.h>
++#include <asm/percpu.h>
+ 
+ #include <uapi/linux/random.h>
+ 

diff --git a/queue-4.19/random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch b/queue-4.19/random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch
new file mode 100644 (file)
index 0000000..277336f
--- /dev/null
+++ b/queue-4.19/random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch
@@ -0,0 +1,52 @@
+From 83bdc7275e6206f560d247be856bceba3e1ed8f2 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Wed, 29 Jul 2020 19:11:00 -0700
+Subject: random32: remove net_rand_state from the latent entropy gcc plugin
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit 83bdc7275e6206f560d247be856bceba3e1ed8f2 upstream.
+
+It turns out that the plugin right now ends up being really unhappy
+about the change from 'static' to 'extern' storage that happened in
+commit f227e3ec3b5c ("random32: update the net random state on interrupt
+and activity").
+
+This is probably a trivial fix for the latent_entropy plugin, but for
+now, just remove net_rand_state from the list of things the plugin
+worries about.
+
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Cc: Emese Revfy <re.emese@gmail.com>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/random.h |    2 +-
+ lib/random32.c         |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -116,7 +116,7 @@ struct rnd_state {
+       __u32 s1, s2, s3, s4;
+ };
+ 
+-DECLARE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
++DECLARE_PER_CPU(struct rnd_state, net_rand_state);
+ 
+ u32 prandom_u32_state(struct rnd_state *state);
+ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
+--- a/lib/random32.c
++++ b/lib/random32.c
+@@ -48,7 +48,7 @@ static inline void prandom_state_selftes
+ }
+ #endif
+ 
+-DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
++DEFINE_PER_CPU(struct rnd_state, net_rand_state);
+ 
+ /**
+  *    prandom_u32_state - seeded pseudo-random number generator.

diff --git a/queue-4.19/series b/queue-4.19/series
index a74bddefb2c0ec67bf7d675dbbf4dade2de1af0b..28b4f8ff6e0b1022337e17c7e8540416682e8b19 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -18,3 +18,5 @@ arm-percpu.h-fix-build-error.patch
 revert-drm-amdgpu-fix-null-dereference-in-dpm-sysfs-handlers.patch
 drm-amdgpu-prevent-kernel-infoleak-in-amdgpu_info_ioctl.patch
 drm-hold-gem-reference-until-object-is-no-longer-accessed.patch
+random-fix-circular-include-dependency-on-arm64-after-addition-of-percpu.h.patch
+random32-remove-net_rand_state-from-the-latent-entropy-gcc-plugin.patch