aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasant Hegde <hegdevasant@linux.vnet.ibm.com>2018-08-07 16:37:13 +0530
committerStewart Smith <stewart@linux.ibm.com>2018-08-14 19:19:28 +1000
commita05f10d94ad18a655f5c07704d62ded91d7d9fb5 (patch)
tree9ca9ff6eff57b1c088d23b181587f47f483ee3bd
parentd4c653149df1cdbd03477ce414e0c326c17da214 (diff)
downloadskiboot-a05f10d94ad18a655f5c07704d62ded91d7d9fb5.zip
skiboot-a05f10d94ad18a655f5c07704d62ded91d7d9fb5.tar.gz
skiboot-a05f10d94ad18a655f5c07704d62ded91d7d9fb5.tar.bz2
core/cpu: Call memset with proper cpu_thread offset
"cpu_thread *t + value" vs "(void *)t + val" Fixes: cfe9d441 (core/cpu: Prevent clobbering of stack guard for boot-cpu) CC: stable <skiboot@lists.ozlabs.org> # v6.0+ CC: Vaibhav Jain <vaibhav@linux.vnet.ibm.com> CC: Nicholas Piggin <npiggin@gmail.com> CC: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> Acked-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com> Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> Reviewed-by: Vaibhav Jain<vaibhav@linux.ibm.com> Signed-off-by: Stewart Smith <stewart@linux.ibm.com> (cherry picked from commit 15880d514e1f27e4380eaaf0b7de5ac90d35da66) Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
-rw-r--r--core/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/cpu.c b/core/cpu.c
index 0077103..06cf1dd 100644
--- a/core/cpu.c
+++ b/core/cpu.c
@@ -833,7 +833,7 @@ static void init_cpu_thread(struct cpu_thread *t,
const size_t guard_skip = container_off_var(t, stack_guard) +
sizeof(t->stack_guard);
- memset(t + guard_skip, 0, sizeof(struct cpu_thread) - guard_skip);
+ memset(((void *)t) + guard_skip, 0, sizeof(struct cpu_thread) - guard_skip);
init_lock(&t->dctl_lock);
init_lock(&t->job_lock);
list_head_init(&t->job_queue);