Commit 33b094fa authored by Anton Blanchard's avatar Anton Blanchard Committed by Greg Kroah-Hartman

powerpc/vdso64: Use double word compare on pointers

commit 5045ea37 upstream.

__kernel_get_syscall_map() and __kernel_clock_getres() use cmpli to
check if the passed in pointer is non zero. cmpli maps to a 32 bit
compare on binutils, so we ignore the top 32 bits.

A simple test case can be created by passing in a bogus pointer with
the bottom 32 bits clear. Using a clk_id that is handled by the VDSO,
then one that is handled by the kernel shows the problem:

  printf("%d\n", clock_getres(CLOCK_REALTIME, (void *)0x100000000));
  printf("%d\n", clock_getres(CLOCK_BOOTTIME, (void *)0x100000000));

And we get:

  0
  -1

The bigger issue is if we pass a valid pointer with the bottom 32 bits
clear, in this case we will return success but won't write any data
to the pointer.

I stumbled across this issue because the LLVM integrated assembler
doesn't accept cmpli with 3 arguments. Fix this by converting them to
cmpldi.

Fixes: a7f290da ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel")
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed04eda8
...@@ -59,7 +59,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map) ...@@ -59,7 +59,7 @@ V_FUNCTION_BEGIN(__kernel_get_syscall_map)
bl V_LOCAL_FUNC(__get_datapage) bl V_LOCAL_FUNC(__get_datapage)
mtlr r12 mtlr r12
addi r3,r3,CFG_SYSCALL_MAP64 addi r3,r3,CFG_SYSCALL_MAP64
cmpli cr0,r4,0 cmpldi cr0,r4,0
crclr cr0*4+so crclr cr0*4+so
beqlr beqlr
li r0,NR_syscalls li r0,NR_syscalls
......
...@@ -145,7 +145,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) ...@@ -145,7 +145,7 @@ V_FUNCTION_BEGIN(__kernel_clock_getres)
bne cr0,99f bne cr0,99f
li r3,0 li r3,0
cmpli cr0,r4,0 cmpldi cr0,r4,0
crclr cr0*4+so crclr cr0*4+so
beqlr beqlr
lis r5,CLOCK_REALTIME_RES@h lis r5,CLOCK_REALTIME_RES@h
......
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