This is a note to let you know that I've just added the patch titled
Revert "y2038: rusage: use __kernel_old_timeval"
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-y2038-rusage-use-__kernel_old_timeval.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ben@xxxxxxxxxxxxxxx Tue Apr 30 09:50:12 2024
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Mon, 29 Apr 2024 23:44:50 +0200
Subject: Revert "y2038: rusage: use __kernel_old_timeval"
To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx>, Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>, linux-kernel@xxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, torvalds@xxxxxxxxxxxxxxxxxxxx, akpm@xxxxxxxxxxxxxxxxxxxx, shuah@xxxxxxxxxx, patches@xxxxxxxxxxxx, lkft-triage@xxxxxxxxxxxxxxxx, pavel@xxxxxxx
Message-ID: <ZjAU0hFgBDotATCy@xxxxxxxxxxxxxxx>
Content-Disposition: inline
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
This reverts commit d5e38d6b84d6d21a4f8a4f555a0908b6d9ffe224, which
was commit bdd565f817a74b9e30edec108f7cb1dbc762b8a6 upstream. It
broke the build for alpha and that can't be fixed without backporting
other more intrusive y2038 changes.
This was not a completely clean revert as the affected code in
getrusage() was moved by subsequent changes.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/osf_sys.c | 2 +-
include/uapi/linux/resource.h | 4 ++--
kernel/sys.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -964,7 +964,7 @@ put_tv32(struct timeval32 __user *o, str
}
static inline long
-put_tv_to_tv32(struct timeval32 __user *o, struct __kernel_old_timeval *i)
+put_tv_to_tv32(struct timeval32 __user *o, struct timeval *i)
{
return copy_to_user(o, &(struct timeval32){
.tv_sec = i->tv_sec,
--- a/include/uapi/linux/resource.h
+++ b/include/uapi/linux/resource.h
@@ -22,8 +22,8 @@
#define RUSAGE_THREAD 1 /* only the calling thread */
struct rusage {
- struct __kernel_old_timeval ru_utime; /* user time used */
- struct __kernel_old_timeval ru_stime; /* system time used */
+ struct timeval ru_utime; /* user time used */
+ struct timeval ru_stime; /* system time used */
__kernel_long_t ru_maxrss; /* maximum resident set size */
__kernel_long_t ru_ixrss; /* integral shared memory size */
__kernel_long_t ru_idrss; /* integral unshared data size */
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1795,8 +1795,8 @@ out_thread:
out_children:
r->ru_maxrss = maxrss * (PAGE_SIZE / 1024); /* convert pages to KBs */
- r->ru_utime = ns_to_kernel_old_timeval(utime);
- r->ru_stime = ns_to_kernel_old_timeval(stime);
+ r->ru_utime = ns_to_timeval(utime);
+ r->ru_stime = ns_to_timeval(stime);
}
SYSCALL_DEFINE2(getrusage, int, who, struct rusage __user *, ru)
Patches currently in stable-queue which might be from ben@xxxxxxxxxxxxxxx are
queue-4.19/revert-loop-remove-sector_t-truncation-checks.patch
queue-4.19/revert-y2038-rusage-use-__kernel_old_timeval.patch
