From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 21 Jun 2021 13:08:06 +0000 (+0200)
Subject: 4.14-stable patches
X-Git-Tag: v5.4.128~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddb4b2c163b023ad3130ba5e494b9df6350ad363;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	mm-slub.c-include-swab.h.patch
---

diff --git a/queue-4.14/mm-slub.c-include-swab.h.patch b/queue-4.14/mm-slub.c-include-swab.h.patch
new file mode 100644
index 00000000000..b74f61550b2
--- /dev/null
+++ b/queue-4.14/mm-slub.c-include-swab.h.patch
@@ -0,0 +1,35 @@
+From 1b3865d016815cbd69a1879ca1c8a8901fda1072 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Tue, 15 Jun 2021 18:23:39 -0700
+Subject: mm/slub.c: include swab.h
+
+From: Andrew Morton <akpm@linux-foundation.org>
+
+commit 1b3865d016815cbd69a1879ca1c8a8901fda1072 upstream.
+
+Fixes build with CONFIG_SLAB_FREELIST_HARDENED=y.
+
+Hopefully.  But it's the right thing to do anwyay.
+
+Fixes: 1ad53d9fa3f61 ("slub: improve bit diffusion for freelist ptr obfuscation")
+Link: https://bugzilla.kernel.org/show_bug.cgi?id=213417
+Reported-by: <vannguye@cisco.com>
+Acked-by: Kees Cook <keescook@chromium.org>
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ mm/slub.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -15,6 +15,7 @@
+ #include <linux/module.h>
+ #include <linux/bit_spinlock.h>
+ #include <linux/interrupt.h>
++#include <linux/swab.h>
+ #include <linux/bitops.h>
+ #include <linux/slab.h>
+ #include "slab.h"
diff --git a/queue-4.14/series b/queue-4.14/series
index d2cc894d4ab..ca631cfa9d7 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -54,3 +54,4 @@ arcv2-save-abi-registers-across-signal-handling.patch
 dmaengine-pl330-fix-wrong-usage-of-spinlock-flags-in-dma_cyclc.patch
 net-bridge-fix-vlan-tunnel-dst-null-pointer-dereference.patch
 net-bridge-fix-vlan-tunnel-dst-refcnt-when-egressing.patch
+mm-slub.c-include-swab.h.patch