summaryrefslogtreecommitdiffstats
path: root/fs/proc/array.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-11-23 21:13:40 +0100
committerBorislav Petkov <bp@suse.de>2016-11-23 21:13:40 +0100
commit627bc29ed90ca50dbf7a4e7b43c267a2920bbadb (patch)
tree838d8aca5a04166b6ad74a2ef0f5291224768501 /fs/proc/array.c
parent044e7a414be9ba20826e5fd482214686193fe7b6 (diff)
parent3f5a7896a5096fd50030a04d4c3f28a7441e30a5 (diff)
downloadcachepc-linux-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.tar.gz
cachepc-linux-627bc29ed90ca50dbf7a4e7b43c267a2920bbadb.zip
Merge tip:ras/core to pick up dependent changes
tip:ras/core contains the respective Fam17h x86 RAS bits which amd64_edac is going to use. So merge it into the EDAC branch. Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 89600fd5963d..81818adb8e9e 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -412,10 +412,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
mm = get_task_mm(task);
if (mm) {
vsize = task_vsize(mm);
- if (permitted) {
- eip = KSTK_EIP(task);
- esp = KSTK_ESP(task);
- }
+ /*
+ * esp and eip are intentionally zeroed out. There is no
+ * non-racy way to read them without freezing the task.
+ * Programs that need reliable values can use ptrace(2).
+ */
}
get_task_comm(tcomm, task);