Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88200bc2 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: entry_32.S fix compile warnings - fix work mask bit width 



Fix:

 arch/x86/kernel/entry_32.S:446: Warning: 00000000080001d1 shortened to 00000000000001d1
 arch/x86/kernel/entry_32.S:457: Warning: 000000000800feff shortened to 000000000000feff
 arch/x86/kernel/entry_32.S:527: Warning: 00000000080001d1 shortened to 00000000000001d1
 arch/x86/kernel/entry_32.S:541: Warning: 000000000800feff shortened to 000000000000feff
 arch/x86/kernel/entry_32.S:676: Warning: 0000000008000091 shortened to 0000000000000091

TIF_SYSCALL_FTRACE is 0x08000000 and until now we checked the
first 16 bits of the work mask - bit 27 falls outside of that.

Update the entry_32.S code to check the full 32-bit mask.

[ %cx => %ecx fix from Cyrill Gorcunov <gorcunov@gmail.com> ]

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: "H. Peter Anvin" <hpa@kernel.org>
LKML-Reference: <1237012693.18733.3.camel@ht.satnam>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f3b6eaf0

arch/x86/kernel/entry_32.S

+8 −10
Original line number Diff line number Diff line
@@ -442,8 +442,7 @@ sysenter_past_esp: 


	GET_THREAD_INFO(%ebp)



	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */

	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)

	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)

	jnz sysenter_audit

sysenter_do_call:

	cmpl $(nr_syscalls), %eax
@@ -454,7 +453,7 @@ sysenter_do_call: 
	DISABLE_INTERRUPTS(CLBR_ANY)

	TRACE_IRQS_OFF

	movl TI_flags(%ebp), %ecx

	testw $_TIF_ALLWORK_MASK, %cx

	testl $_TIF_ALLWORK_MASK, %ecx

	jne sysexit_audit

sysenter_exit:

/* if something modifies registers it must also disable sysexit */
@@ -468,7 +467,7 @@ sysenter_exit: 


#ifdef CONFIG_AUDITSYSCALL

sysenter_audit:

	testw $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)

	testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%ebp)

	jnz syscall_trace_entry

	addl $4,%esp

	CFI_ADJUST_CFA_OFFSET -4
@@ -485,7 +484,7 @@ sysenter_audit: 
	jmp sysenter_do_call



sysexit_audit:

	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx

	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx

	jne syscall_exit_work

	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_ANY)
@@ -498,7 +497,7 @@ sysexit_audit: 
	DISABLE_INTERRUPTS(CLBR_ANY)

	TRACE_IRQS_OFF

	movl TI_flags(%ebp), %ecx

	testw $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %cx

	testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT), %ecx

	jne syscall_exit_work

	movl PT_EAX(%esp),%eax	/* reload syscall return value */

	jmp sysenter_exit
@@ -523,8 +522,7 @@ ENTRY(system_call) 
	SAVE_ALL

	GET_THREAD_INFO(%ebp)

					# system call tracing in operation / emulation

	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */

	testw $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)

	testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)

	jnz syscall_trace_entry

	cmpl $(nr_syscalls), %eax

	jae syscall_badsys
@@ -538,7 +536,7 @@ syscall_exit: 
					# between sampling and the iret

	TRACE_IRQS_OFF

	movl TI_flags(%ebp), %ecx

	testw $_TIF_ALLWORK_MASK, %cx	# current->work

	testl $_TIF_ALLWORK_MASK, %ecx	# current->work

	jne syscall_exit_work



restore_all:
@@ -673,7 +671,7 @@ END(syscall_trace_entry) 
	# perform syscall exit tracing

	ALIGN

syscall_exit_work:

	testb $_TIF_WORK_SYSCALL_EXIT, %cl

	testl $_TIF_WORK_SYSCALL_EXIT, %ecx

	jz work_pending

	TRACE_IRQS_ON

	ENABLE_INTERRUPTS(CLBR_ANY)	# could let syscall_trace_leave() call