diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2021-09-16 07:03:00 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2021-09-16 07:03:00 -0400 |
| commit | 33ff57f825f3237ce6b555afb0a55a7bf9a10eeb (patch) | |
| tree | edf39c75134fab7d909b0beb8940f14cf1385012 | |
| parent | Linuxpatch 5.14.4 (diff) | |
| download | linux-patches-33ff57f825f3237ce6b555afb0a55a7bf9a10eeb.tar.gz linux-patches-33ff57f825f3237ce6b555afb0a55a7bf9a10eeb.tar.bz2 linux-patches-33ff57f825f3237ce6b555afb0a55a7bf9a10eeb.zip | |
Linux patch 5.14.55.14-6
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1004_linux-5.14.5.patch | 56 |
2 files changed, 60 insertions, 0 deletions
diff --git a/0000_README b/0000_README index 79faaf32..3b101ac5 100644 --- a/0000_README +++ b/0000_README @@ -63,6 +63,10 @@ Patch: 1003_linux-5.14.4.patch From: http://www.kernel.org Desc: Linux 5.14.4 +Patch: 1004_linux-5.14.5.patch +From: http://www.kernel.org +Desc: Linux 5.14.5 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1004_linux-5.14.5.patch b/1004_linux-5.14.5.patch new file mode 100644 index 00000000..5fbff401 --- /dev/null +++ b/1004_linux-5.14.5.patch @@ -0,0 +1,56 @@ +diff --git a/Makefile b/Makefile +index e16a1a80074cd..0eaa5623f4060 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 14 +-SUBLEVEL = 4 ++SUBLEVEL = 5 + EXTRAVERSION = + NAME = Opossums on Parade + +diff --git a/include/linux/time64.h b/include/linux/time64.h +index 81b9686a20799..5117cb5b56561 100644 +--- a/include/linux/time64.h ++++ b/include/linux/time64.h +@@ -25,9 +25,7 @@ struct itimerspec64 { + #define TIME64_MIN (-TIME64_MAX - 1) + + #define KTIME_MAX ((s64)~((u64)1 << 63)) +-#define KTIME_MIN (-KTIME_MAX - 1) + #define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) +-#define KTIME_SEC_MIN (KTIME_MIN / NSEC_PER_SEC) + + /* + * Limits for settimeofday(): +@@ -126,13 +124,10 @@ static inline bool timespec64_valid_settod(const struct timespec64 *ts) + */ + static inline s64 timespec64_to_ns(const struct timespec64 *ts) + { +- /* Prevent multiplication overflow / underflow */ +- if (ts->tv_sec >= KTIME_SEC_MAX) ++ /* Prevent multiplication overflow */ ++ if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX) + return KTIME_MAX; + +- if (ts->tv_sec <= KTIME_SEC_MIN) +- return KTIME_MIN; +- + return ((s64) ts->tv_sec * NSEC_PER_SEC) + ts->tv_nsec; + } + +diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c +index a002685f688d6..517be7fd175ef 100644 +--- a/kernel/time/posix-cpu-timers.c ++++ b/kernel/time/posix-cpu-timers.c +@@ -1346,6 +1346,8 @@ void set_process_cpu_timer(struct task_struct *tsk, unsigned int clkid, + } + } + ++ if (!*newval) ++ return; + *newval += now; + } + |