Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5e38d6b authored Oct 25, 2019 by Arnd Bergmann Committed by Sasha Levin Mar 15, 2024

y2038: rusage: use __kernel_old_timeval



[ Upstream commit bdd565f817a74b9e30edec108f7cb1dbc762b8a6 ]

There are two 'struct timeval' fields in 'struct rusage'.

Unfortunately the definition of timeval is now ambiguous when used in
user space with a libc that has a 64-bit time_t, and this also changes
the 'rusage' definition in user space in a way that is incompatible with
the system call interface.

While there is no good solution to avoid all ambiguity here, change
the definition in the kernel headers to be compatible with the kernel
ABI, using __kernel_old_timeval as an unambiguous base type.

In previous discussions, there was also a plan to add a replacement
for rusage based on 64-bit timestamps and nanosecond resolution,
i.e. 'struct __kernel_timespec'. I have patches for that as well,
if anyone thinks we should do that.

Reviewed-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Stable-dep-of: daa694e41375 ("getrusage: move thread_group_cputime_adjusted() outside of lock_task_sighand()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent bcb71642

arch/alpha/kernel/osf_sys.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -964,7 +964,7 @@ put_tv32(struct timeval32 __user o, struct timespec64 i)
		}

		static inline long
		put_tv_to_tv32(struct timeval32 __user o, struct timeval i)
		put_tv_to_tv32(struct timeval32 __user o, struct __kernel_old_timeval i)
		{
		return copy_to_user(o, &(struct timeval32){
		.tv_sec = i->tv_sec,

include/uapi/linux/resource.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@
		#define RUSAGE_THREAD 1 /* only the calling thread */

		struct rusage {
		struct timeval ru_utime; /* user time used */
		struct timeval ru_stime; /* system time used */
		struct __kernel_old_timeval ru_utime; /* user time used */
		struct __kernel_old_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 */

kernel/sys.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1772,8 +1772,8 @@ void getrusage(struct task_struct p, int who, struct rusage r)
		unlock_task_sighand(p, &flags);

		out:
		r->ru_utime = ns_to_timeval(utime);
		r->ru_stime = ns_to_timeval(stime);
		r->ru_utime = ns_to_kernel_old_timeval(utime);
		r->ru_stime = ns_to_kernel_old_timeval(stime);

		if (who != RUSAGE_CHILDREN) {
		struct mm_struct *mm = get_task_mm(p);