linux-kernel - [PATCH] cputime: Fix omitted ticks passed in parameter (was: Re: [tip:sched/urgent] sched/cputime: Fix steal time accounting)

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160811125822.GB4214@lerouge>
Date:	Thu, 11 Aug 2016 14:58:24 +0200
From:	Frederic Weisbecker <fweisbec@...il.com>
To:	wanpeng.li@...mail.com, mingo@...nel.org, peterz@...radead.org,
	hpa@...or.com, torvalds@...ux-foundation.org,
	linux-kernel@...r.kernel.org, riel@...hat.com, pbonzini@...hat.com,
	tglx@...utronix.de, rkrcmar@...hat.com
Cc:	linux-tip-commits@...r.kernel.org
Subject: [PATCH] cputime: Fix omitted ticks passed in parameter (was: Re:
 [tip:sched/urgent] sched/cputime: Fix steal time accounting)

Commit f9bcf1e0e0145323ba2cf72ecad5264ff3883eb1
("sched/cputime: Fix steal time accounting") fixes a leak on steal time
accounting but forgets to account the ticks passed in parameters,
assuming there is only one to take into account.

Let's consider that parameter back.

Cc: Wanpeng Li <wanpeng.li@...mail.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Paolo Bonzini <pbonzini@...hat.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Radim <rkrcmar@...hat.com>
Cc: Rik van Riel <riel@...hat.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Frederic Weisbecker <fweisbec@...il.com>
---
 kernel/sched/cputime.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c
index 8b9bcc5..9858266 100644
--- a/kernel/sched/cputime.c
+++ b/kernel/sched/cputime.c
@@ -509,12 +509,13 @@ void account_process_tick(struct task_struct *p, int user_tick)
 void account_idle_ticks(unsigned long ticks)
 {
 	cputime_t cputime, steal;
+
 	if (sched_clock_irqtime) {
 		irqtime_account_idle_ticks(ticks);
 		return;
 	}
 
-	cputime = cputime_one_jiffy;
+	cputime = jiffies_to_cputime(ticks);
 	steal = steal_account_process_time(cputime);
 
 	if (steal >= cputime)
-- 
2.7.0