Commit aca7573f authored by Vaibhav Jain's avatar Vaibhav Jain Committed by Michael Ellerman

powerpc: Avoid signed to unsigned conversion in set_thread_tidr()

There is an unsafe signed to unsigned conversion in set_thread_tidr()
that may cause an error value to be assigned to SPRN_TIDR register and
used as thread-id.

The issue happens as assign_thread_tidr() returns an int and
thread.tidr is an unsigned-long. So a negative error code returned
from assign_thread_tidr() will fail the error check and gets assigned
as tidr as a large positive value.

To fix this the patch assigns the return value of assign_thread_tidr()
to a temporary int and assigns it to thread.tidr iff its '> 0'.

The patch shouldn't impact the calling convention of set_thread_tidr()
i.e all -ve return-values are error codes and a return value of '0'
indicates success.

Fixes: ec233ede("powerpc: Add support for setting SPRN_TIDR")
Signed-off-by: default avatarVaibhav Jain <vaibhav@linux.vnet.ibm.com>
Reviewed-by: Christophe Lombard clombard@linux.vnet.ibm.com
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 2621e945
...@@ -1569,16 +1569,19 @@ void arch_release_task_struct(struct task_struct *t) ...@@ -1569,16 +1569,19 @@ void arch_release_task_struct(struct task_struct *t)
*/ */
int set_thread_tidr(struct task_struct *t) int set_thread_tidr(struct task_struct *t)
{ {
int rc;
if (!cpu_has_feature(CPU_FTR_ARCH_300)) if (!cpu_has_feature(CPU_FTR_ARCH_300))
return -EINVAL; return -EINVAL;
if (t != current) if (t != current)
return -EINVAL; return -EINVAL;
t->thread.tidr = assign_thread_tidr(); rc = assign_thread_tidr();
if (t->thread.tidr < 0) if (rc < 0)
return t->thread.tidr; return rc;
t->thread.tidr = rc;
mtspr(SPRN_TIDR, t->thread.tidr); mtspr(SPRN_TIDR, t->thread.tidr);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment