github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: sched/events: Fix out of bound memory access

Browse Source 
GCC 8 provides the following warning:

./include/trace/events/sched.h:736:3: warning: ‘memcpy’ forming offset
[8, 16] is out of the bounds [0, 7] [-Warray-bounds]
   memcpy(__entry->comm, p ? p->comm : "(null)", TASK_COMM_LEN);

Indeed, in the case where p==NULL, we copy TASK_COMM_LEN bytes from the
memory location where "(null)" is stored, which is incorrect.

Fix this by making sure to pass the right size parameter to memcpy in
all cases.

Bug: 120440300
Test: Compilation warning gone, no changes noticed in traces
Fixes: 4290369491 ("ANDROID: sched/events: Introduce sched_entity load
tracking trace event")
Change-Id: Id93c9c0265f10c09b731daca25401696785b4b1e
Suggested-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
This commit is contained in:
Quentin Perret 2018-12-14 09:05:20 +00:00
parent 67319b77a0
commit a359befaf6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/trace/events/sched.h
View File

@ -733,7 +733,8 @@ TRACE_EVENT(sched_load_se,
__entry->cpu = __trace_sched_cpu(gcfs_rq, se);
__trace_sched_path(gcfs_rq, __get_dynamic_array(path),
__get_dynamic_array_len(path));
memcpy(__entry->comm, p ? p->comm : "(null)", TASK_COMM_LEN);
memcpy(__entry->comm, p ? p->comm : "(null)",
p ? TASK_COMM_LEN : sizeof("(null)"));
__entry->pid = p ? p->pid : -1;
__entry->load = se->avg.load_avg;
__entry->rbl_load = se->avg.runnable_load_avg;