Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IA64] Fix fast syscall version of getcpu()

Browse source 
GETCPU(2) says:
  int getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache);
  ...
  When either cpu or node is NULL nothing is written to the respective pointer.

But the fast system call path had no checks for NULL, and would
thus return -EFAULT if either (or both) of these were NULL.

Reported-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Tony Luck 2012-05-16 13:58:29 -07:00
parent c7173271f3
commit 7411d89535
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
arch/ia64/kernel/fsys.S
View file

@ -559,11 +559,15 @@ ENTRY(fsys_getcpu)
;; ;;
tnat.nz p7,p0 = r33 // I guard against NaT argument tnat.nz p7,p0 = r33 // I guard against NaT argument
(p7) br.cond.spnt.few .fail_einval // B (p7) br.cond.spnt.few .fail_einval // B
;;
cmp.ne p6,p0=r32,r0
cmp.ne p7,p0=r33,r0
;;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
movl r17=cpu_to_node_map movl r17=cpu_to_node_map
;; ;;
EX(.fail_efault, probe.w.fault r32, 3) // M This takes 5 cycles EX(.fail_efault, (p6) probe.w.fault r32, 3) // M This takes 5 cycles
EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles EX(.fail_efault, (p7) probe.w.fault r33, 3) // M This takes 5 cycles
shladd r18=r3,1,r17 shladd r18=r3,1,r17
;; ;;
ld2 r20=[r18] // r20 = cpu_to_node_map[cpu] ld2 r20=[r18] // r20 = cpu_to_node_map[cpu]
@ -573,20 +577,20 @@ EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles
(p8) br.spnt.many fsys_fallback_syscall (p8) br.spnt.many fsys_fallback_syscall
;; ;;
;; ;;
EX(.fail_efault, st4 [r32] = r3) EX(.fail_efault, (p6) st4 [r32] = r3)
EX(.fail_efault, st2 [r33] = r20) EX(.fail_efault, (p7) st2 [r33] = r20)
mov r8=0 mov r8=0
;; ;;
#else #else
EX(.fail_efault, probe.w.fault r32, 3) // M This takes 5 cycles EX(.fail_efault, (p6) probe.w.fault r32, 3) // M This takes 5 cycles
EX(.fail_efault, probe.w.fault r33, 3) // M This takes 5 cycles EX(.fail_efault, (p7) probe.w.fault r33, 3) // M This takes 5 cycles
and r2 = TIF_ALLWORK_MASK,r2 and r2 = TIF_ALLWORK_MASK,r2
;; ;;
cmp.ne p8,p0=0,r2 cmp.ne p8,p0=0,r2
(p8) br.spnt.many fsys_fallback_syscall (p8) br.spnt.many fsys_fallback_syscall
;; ;;
EX(.fail_efault, st4 [r32] = r3) EX(.fail_efault, (p6) st4 [r32] = r3)
EX(.fail_efault, st2 [r33] = r0) EX(.fail_efault, (p7) st2 [r33] = r0)
mov r8=0 mov r8=0
;; ;;
#endif #endif