lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 03 Mar 2020 18:40:39 -0000 From: "tip-bot2 for Cyril Hrubis" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Cyril Hrubis <chrubis@...e.cz>, Thomas Gleixner <tglx@...utronix.de>, Dmitry Safonov <dima@...sta.com>, x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org> Subject: [tip: timers/urgent] sys/sysinfo: Respect boottime inside time namespace The following commit has been merged into the timers/urgent branch of tip: Commit-ID: ecc421e05bab97cf3ff4fe456ade47ef84dba8c2 Gitweb: https://git.kernel.org/tip/ecc421e05bab97cf3ff4fe456ade47ef84dba8c2 Author: Cyril Hrubis <chrubis@...e.cz> AuthorDate: Tue, 03 Mar 2020 16:06:38 +01:00 Committer: Thomas Gleixner <tglx@...utronix.de> CommitterDate: Tue, 03 Mar 2020 19:34:32 +01:00 sys/sysinfo: Respect boottime inside time namespace The sysinfo() syscall includes uptime in seconds but has no correction for time namespaces which makes it inconsistent with the /proc/uptime inside of a time namespace. Add the missing time namespace adjustment call. Signed-off-by: Cyril Hrubis <chrubis@...e.cz> Signed-off-by: Thomas Gleixner <tglx@...utronix.de> Reviewed-by: Dmitry Safonov <dima@...sta.com> Link: https://lkml.kernel.org/r/20200303150638.7329-1-chrubis@suse.cz --- kernel/sys.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sys.c b/kernel/sys.c index f9bc5c3..d325f3a 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -47,6 +47,7 @@ #include <linux/syscalls.h> #include <linux/kprobes.h> #include <linux/user_namespace.h> +#include <linux/time_namespace.h> #include <linux/binfmts.h> #include <linux/sched.h> @@ -2546,6 +2547,7 @@ static int do_sysinfo(struct sysinfo *info) memset(info, 0, sizeof(struct sysinfo)); ktime_get_boottime_ts64(&tp); + timens_add_boottime(&tp); info->uptime = tp.tv_sec + (tp.tv_nsec ? 1 : 0); get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT);
Powered by blists - more mailing lists