linux-kernel - [tip:timers/core] posix_cpu_timers: Move the add_device

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]

Date:   Wed, 16 Nov 2016 00:33:06 -0800
From:   tip-bot for Nicolas Pitre <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     hpa@...or.com, richardcochran@...il.com, nicolas.pitre@...aro.org,
        mingo@...nel.org, pebolle@...cali.nl, linux-kernel@...r.kernel.org,
        nico@...aro.org, john.stultz@...aro.org, josh@...htriplett.org,
        tglx@...utronix.de, ecree@...arflare.com, mmarek@...e.com
Subject: [tip:timers/core] posix_cpu_timers: Move the
 add_device_randomness() call to a proper place

Commit-ID:  53d3eaa31508222e445b489f3c3ac4c63542a4ef
Gitweb:     http://git.kernel.org/tip/53d3eaa31508222e445b489f3c3ac4c63542a4ef
Author:     Nicolas Pitre <nicolas.pitre@...aro.org>
AuthorDate: Fri, 11 Nov 2016 00:10:09 -0500
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Wed, 16 Nov 2016 09:26:34 +0100

posix_cpu_timers: Move the add_device_randomness() call to a proper place

There is no logical relation between add_device_randomness() and
posix_cpu_timers_exit(). Let's move the former to where the later
is called. This way, when posix-cpu-timers.c is compiled out, there
is no need to worry about not losing a call to add_device_randomness().

Signed-off-by: Nicolas Pitre <nico@...aro.org>
Acked-by: John Stultz <john.stultz@...aro.org>
Cc: Paul Bolle <pebolle@...cali.nl>
Cc: linux-kbuild@...r.kernel.org
Cc: netdev@...r.kernel.org
Cc: Richard Cochran <richardcochran@...il.com>
Cc: Josh Triplett <josh@...htriplett.org>
Cc: Michal Marek <mmarek@...e.com>
Cc: Edward Cree <ecree@...arflare.com>
Link: http://lkml.kernel.org/r/1478841010-28605-6-git-send-email-nicolas.pitre@linaro.org
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 kernel/exit.c                  | 4 ++++
 kernel/time/posix-cpu-timers.c | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/exit.c b/kernel/exit.c
index 9d68c45..d16bcdd 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -54,6 +54,7 @@
 #include <linux/writeback.h>
 #include <linux/shm.h>
 #include <linux/kcov.h>
+#include <linux/random.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -116,6 +117,9 @@ static void __exit_signal(struct task_struct *tsk)
 			sig->curr_target = next_thread(tsk);
 	}
 
+	add_device_randomness((const void*) &tsk->se.sum_exec_runtime,
+			      sizeof(unsigned long long));
+
 	/*
 	 * Accumulate here the counters for all threads as they die. We could
 	 * skip the group leader because it is the last user of signal_struct,
diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
index 39008d7..e582f20 100644
--- a/kernel/time/posix-cpu-timers.c
+++ b/kernel/time/posix-cpu-timers.c
@@ -9,7 +9,6 @@
 #include <asm/uaccess.h>
 #include <linux/kernel_stat.h>
 #include <trace/events/timer.h>
-#include <linux/random.h>
 #include <linux/tick.h>
 #include <linux/workqueue.h>
 
@@ -447,10 +446,7 @@ static void cleanup_timers(struct list_head *head)
  */
 void posix_cpu_timers_exit(struct task_struct *tsk)
 {
-	add_device_randomness((const void*) &tsk->se.sum_exec_runtime,
-						sizeof(unsigned long long));
 	cleanup_timers(tsk->cpu_timers);
-
 }
 void posix_cpu_timers_exit_group(struct task_struct *tsk)
 {