From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 16 Sep 2021 09:06:09 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v5.14.5~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77c76853af3eb9b18b93ca5603840d5d42dbd7c3;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	revert-posix-cpu-timers-force-next-expiration-recalc-after.patch
---

diff --git a/queue-5.4/revert-posix-cpu-timers-force-next-expiration-recalc-after.patch b/queue-5.4/revert-posix-cpu-timers-force-next-expiration-recalc-after.patch
new file mode 100644
index 00000000000..5dcdddf5a69
--- /dev/null
+++ b/queue-5.4/revert-posix-cpu-timers-force-next-expiration-recalc-after.patch
@@ -0,0 +1,39 @@
+From 95cfea521f698ace3591dea4b49ac90dbeed9e86 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 16 Sep 2021 10:51:42 +0200
+Subject: Revert "posix-cpu-timers: Force next expiration recalc after
+ itimer reset"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit c322a963d522e9a4273e18c9d7bd6fd40a25160f which is
+commit 406dd42bd1ba0c01babf9cde169bb319e52f6147 upstream.
+
+It is reported to cause regressions.  A proposed fix has been posted,
+but it is not in a released kernel yet.  So just revert this from the
+stable release so that the bug is fixed.  If it's really needed we can
+add it back in in a future release.
+
+Link: https://lore.kernel.org/r/87ilz1pwaq.fsf@wylie.me.uk
+Reported-by: "Alan J. Wylie" <alan@wylie.me.uk>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Frederic Weisbecker <frederic@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/time/posix-cpu-timers.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/time/posix-cpu-timers.c
++++ b/kernel/time/posix-cpu-timers.c
+@@ -1201,6 +1201,8 @@ void set_process_cpu_timer(struct task_s
+ 			}
+ 		}
+ 
++		if (!*newval)
++			return;
+ 		*newval += now;
+ 	}
+ 
diff --git a/queue-5.4/series b/queue-5.4/series
index a115a9fa3f9..b8af56814f1 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -176,3 +176,4 @@ net-fix-null-pointer-reference-in-cipso_v4_doi_free.patch
 fix-array-index-out-of-bounds-in-taprio_change.patch
 net-w5100-check-return-value-after-calling-platform_.patch
 revert-block-nbd-add-sanity-check-for-first_minor.patch
+revert-posix-cpu-timers-force-next-expiration-recalc-after.patch