From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 23 Sep 2021 08:25:21 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.285~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01eef006c30601941a25bcf55d1c4c11aabc0495;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	apparmor-remove-duplicate-macro-list_entry_is_head.patch
---

diff --git a/queue-5.4/apparmor-remove-duplicate-macro-list_entry_is_head.patch b/queue-5.4/apparmor-remove-duplicate-macro-list_entry_is_head.patch
new file mode 100644
index 00000000000..0da9cccd5b3
--- /dev/null
+++ b/queue-5.4/apparmor-remove-duplicate-macro-list_entry_is_head.patch
@@ -0,0 +1,40 @@
+From 9801ca279ad37f72f71234fa81722afd95a3f997 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Tue, 15 Dec 2020 20:47:16 -0800
+Subject: apparmor: remove duplicate macro list_entry_is_head()
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+commit 9801ca279ad37f72f71234fa81722afd95a3f997 upstream.
+
+Strangely I hadn't had noticed the existence of the list_entry_is_head()
+in apparmor code when added the same one in the list.h.  Luckily it's
+fully identical and didn't break builds.  In any case we don't need a
+duplicate anymore, thus remove it from apparmor code.
+
+Link: https://lkml.kernel.org/r/20201208100639.88182-1-andriy.shevchenko@linux.intel.com
+Fixes: e130816164e244 ("include/linux/list.h: add a macro to test if entry is pointing to the head")
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Acked-by: John Johansen <john.johansen@canonical.com>
+Cc: James Morris <jmorris@namei.org>
+Cc: "Serge E . Hallyn " <serge@hallyn.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ security/apparmor/apparmorfs.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/security/apparmor/apparmorfs.c
++++ b/security/apparmor/apparmorfs.c
+@@ -1960,9 +1960,6 @@ fail2:
+ 	return error;
+ }
+ 
+-
+-#define list_entry_is_head(pos, head, member) (&pos->member == (head))
+-
+ /**
+  * __next_ns - find the next namespace to list
+  * @root: root namespace to stop search at (NOT NULL)
diff --git a/queue-5.4/series b/queue-5.4/series
index c61dff5f419..a25e77ed4bd 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -7,3 +7,4 @@ kvm-remember-position-in-kvm-vcpus-array.patch
 console-consume-apc-dm-dcs.patch
 s390-pci_mmio-fully-validate-the-vma-before-calling-follow_pte.patch
 arm-qualify-enabling-of-swiotlb_init.patch
+apparmor-remove-duplicate-macro-list_entry_is_head.patch