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

Commit 6f46b3ae authored by Oleg Nesterov's avatar Oleg Nesterov Committed by H. Peter Anvin
Browse files

x86: copy_thread: Don't nullify ->ptrace_bps twice 



Both 32bit and 64bit versions of copy_thread() do memset(ptrace_bps)
twice for no reason, kill the 2nd memset().

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Link: http://lkml.kernel.org/r/20140902175733.GA21676@redhat.com


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent dc56c0f9

arch/x86/kernel/process_32.c

+1 −3
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 


	p->thread.sp = (unsigned long) childregs;

	p->thread.sp0 = (unsigned long) (childregs+1);

	memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));



	if (unlikely(p->flags & PF_KTHREAD)) {

		/* kernel thread */
@@ -153,7 +154,6 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
		childregs->cs = __KERNEL_CS | get_kernel_rpl();

		childregs->flags = X86_EFLAGS_IF | X86_EFLAGS_FIXED;

		p->thread.io_bitmap_ptr = NULL;

		memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));

		return 0;

	}

	*childregs = *current_pt_regs();
@@ -168,8 +168,6 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
	tsk = current;

	err = -ENOMEM;



	memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));



	if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {

		p->thread.io_bitmap_ptr = kmemdup(tsk->thread.io_bitmap_ptr,

						IO_BITMAP_BYTES, GFP_KERNEL);

arch/x86/kernel/process_64.c

+0 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, 
		childregs->sp = sp;



	err = -ENOMEM;

	memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));



	if (unlikely(test_tsk_thread_flag(me, TIF_IO_BITMAP))) {

		p->thread.io_bitmap_ptr = kmemdup(me->thread.io_bitmap_ptr,

						  IO_BITMAP_BYTES, GFP_KERNEL);