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

Commit 8978a318 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Use a TS_RESTORE_SIGMASK
  lmb: Make lmb debugging more useful.
  lmb: Fix inconsistent alignment of size argument.
  sparc: Fix mremap address range validation.
parents f7fd63c0 9a28dbf8

arch/sparc/kernel/sys_sparc.c

+5 −43
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ out: 
	return err;

}



int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)

int sparc_mmap_check(unsigned long addr, unsigned long len)

{

	if (ARCH_SUN4C_SUN4 &&

	    (len > 0x20000000 ||
@@ -295,52 +295,14 @@ asmlinkage unsigned long sparc_mremap(unsigned long addr, 
	unsigned long old_len, unsigned long new_len,

	unsigned long flags, unsigned long new_addr)

{

	struct vm_area_struct *vma;

	unsigned long ret = -EINVAL;

	if (ARCH_SUN4C_SUN4) {

		if (old_len > 0x20000000 || new_len > 0x20000000)

			goto out;

		if (addr < 0xe0000000 && addr + old_len > 0x20000000)



	if (unlikely(sparc_mmap_check(addr, old_len)))

		goto out;

	}

	if (old_len > TASK_SIZE - PAGE_SIZE ||

	    new_len > TASK_SIZE - PAGE_SIZE)

	if (unlikely(sparc_mmap_check(new_addr, new_len)))

		goto out;

	down_write(&current->mm->mmap_sem);

	if (flags & MREMAP_FIXED) {

		if (ARCH_SUN4C_SUN4 &&

		    new_addr < 0xe0000000 &&

		    new_addr + new_len > 0x20000000)

			goto out_sem;

		if (new_addr + new_len > TASK_SIZE - PAGE_SIZE)

			goto out_sem;

	} else if ((ARCH_SUN4C_SUN4 && addr < 0xe0000000 &&

		    addr + new_len > 0x20000000) ||

		   addr + new_len > TASK_SIZE - PAGE_SIZE) {

		unsigned long map_flags = 0;

		struct file *file = NULL;



		ret = -ENOMEM;

		if (!(flags & MREMAP_MAYMOVE))

			goto out_sem;



		vma = find_vma(current->mm, addr);

		if (vma) {

			if (vma->vm_flags & VM_SHARED)

				map_flags |= MAP_SHARED;

			file = vma->vm_file;

		}



		new_addr = get_unmapped_area(file, addr, new_len,

				     vma ? vma->vm_pgoff : 0,

				     map_flags);

		ret = new_addr;

		if (new_addr & ~PAGE_MASK)

			goto out_sem;

		flags |= MREMAP_FIXED;

	}

	ret = do_mremap(addr, old_len, new_len, flags, new_addr);

out_sem:

	up_write(&current->mm->mmap_sem);

out:

	return ret;

arch/sparc64/kernel/rtrap.S

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ __handle_user_windows: 
		wrpr			%g0, RTRAP_PSTATE_IRQOFF, %pstate

		ldx			[%g6 + TI_FLAGS], %l0



1:		andcc			%l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0

1:		andcc			%l0, _TIF_SIGPENDING, %g0

		be,pt			%xcc, __handle_user_windows_continue

		 nop

		mov			%l5, %o1
@@ -86,7 +86,7 @@ __handle_perfctrs: 
		 wrpr			%g0, RTRAP_PSTATE, %pstate

		wrpr			%g0, RTRAP_PSTATE_IRQOFF, %pstate

		ldx			[%g6 + TI_FLAGS], %l0

1:		andcc			%l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0

1:		andcc			%l0, _TIF_SIGPENDING, %g0



		be,pt			%xcc, __handle_perfctrs_continue

		 sethi			%hi(TSTATE_PEF), %o0
@@ -195,7 +195,7 @@ __handle_preemption_continue: 
		 andcc			%l1, %o0, %g0

		andcc			%l0, _TIF_NEED_RESCHED, %g0

		bne,pn			%xcc, __handle_preemption

		 andcc			%l0, (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), %g0

		 andcc			%l0, _TIF_SIGPENDING, %g0

		bne,pn			%xcc, __handle_signal

__handle_signal_continue:

		 ldub			[%g6 + TI_WSAVED], %o2

arch/sparc64/kernel/signal.c

+11 −10
Original line number Diff line number Diff line
@@ -247,7 +247,9 @@ static long _sigpause_common(old_sigset_t set) 


	current->state = TASK_INTERRUPTIBLE;

	schedule();

	set_thread_flag(TIF_RESTORE_SIGMASK);



	set_restore_sigmask();



	return -ERESTARTNOHAND;

}
@@ -537,7 +539,7 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) 
	} else

		restart_syscall = 0;



	if (test_thread_flag(TIF_RESTORE_SIGMASK))

	if (current_thread_info()->status & TS_RESTORE_SIGMASK)

		oldset = &current->saved_sigmask;

	else

		oldset = &current->blocked;
@@ -566,13 +568,12 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) 
			syscall_restart(orig_i0, regs, &ka.sa);

		handle_signal(signr, &ka, &info, oldset, regs);



		/* a signal was successfully delivered; the saved

		/* A signal was successfully delivered; the saved

		 * sigmask will have been stored in the signal frame,

		 * and will be restored by sigreturn, so we can simply

		 * clear the TIF_RESTORE_SIGMASK flag.

		 * clear the TS_RESTORE_SIGMASK flag.

		 */

		if (test_thread_flag(TIF_RESTORE_SIGMASK))

			clear_thread_flag(TIF_RESTORE_SIGMASK);

		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

		return;

	}

	if (restart_syscall &&
@@ -591,17 +592,17 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) 
		regs->tnpc -= 4;

	}



	/* if there's no signal to deliver, we just put the saved sigmask

	/* If there's no signal to deliver, we just put the saved sigmask

	 * back

	 */

	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {

		clear_thread_flag(TIF_RESTORE_SIGMASK);

	if (current_thread_info()->status & TS_RESTORE_SIGMASK) {

		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

	}

}



void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long thread_info_flags)

{

	if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))

	if (thread_info_flags & _TIF_SIGPENDING)

		do_signal(regs, orig_i0);

}

arch/sparc64/kernel/signal32.c

+6 −7
Original line number Diff line number Diff line
@@ -788,13 +788,12 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs, 
			syscall_restart32(orig_i0, regs, &ka.sa);

		handle_signal32(signr, &ka, &info, oldset, regs);



		/* a signal was successfully delivered; the saved

		/* A signal was successfully delivered; the saved

		 * sigmask will have been stored in the signal frame,

		 * and will be restored by sigreturn, so we can simply

		 * clear the TIF_RESTORE_SIGMASK flag.

		 * clear the TS_RESTORE_SIGMASK flag.

		 */

		if (test_thread_flag(TIF_RESTORE_SIGMASK))

			clear_thread_flag(TIF_RESTORE_SIGMASK);

		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

		return;

	}

	if (restart_syscall &&
@@ -813,11 +812,11 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs, 
		regs->tnpc -= 4;

	}



	/* if there's no signal to deliver, we just put the saved sigmask

	/* If there's no signal to deliver, we just put the saved sigmask

	 * back

	 */

	if (test_thread_flag(TIF_RESTORE_SIGMASK)) {

		clear_thread_flag(TIF_RESTORE_SIGMASK);

	if (current_thread_info()->status & TS_RESTORE_SIGMASK) {

		current_thread_info()->status &= ~TS_RESTORE_SIGMASK;

		sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);

	}

}

arch/sparc64/kernel/sys_sparc.c

+4 −32
Original line number Diff line number Diff line
@@ -542,8 +542,7 @@ asmlinkage long sparc64_personality(unsigned long personality) 
	return ret;

}



int sparc64_mmap_check(unsigned long addr, unsigned long len,

		unsigned long flags)

int sparc64_mmap_check(unsigned long addr, unsigned long len)

{

	if (test_thread_flag(TIF_32BIT)) {

		if (len >= STACK_TOP32)
@@ -609,46 +608,19 @@ asmlinkage unsigned long sys64_mremap(unsigned long addr, 
	unsigned long old_len, unsigned long new_len,

	unsigned long flags, unsigned long new_addr)

{

	struct vm_area_struct *vma;

	unsigned long ret = -EINVAL;



	if (test_thread_flag(TIF_32BIT))

		goto out;

	if (unlikely(new_len >= VA_EXCLUDE_START))

		goto out;

	if (unlikely(invalid_64bit_range(addr, old_len)))

	if (unlikely(sparc64_mmap_check(addr, old_len)))

		goto out;

	if (unlikely(sparc64_mmap_check(new_addr, new_len)))

		goto out;



	down_write(&current->mm->mmap_sem);

	if (flags & MREMAP_FIXED) {

		if (invalid_64bit_range(new_addr, new_len))

			goto out_sem;

	} else if (invalid_64bit_range(addr, new_len)) {

		unsigned long map_flags = 0;

		struct file *file = NULL;



		ret = -ENOMEM;

		if (!(flags & MREMAP_MAYMOVE))

			goto out_sem;



		vma = find_vma(current->mm, addr);

		if (vma) {

			if (vma->vm_flags & VM_SHARED)

				map_flags |= MAP_SHARED;

			file = vma->vm_file;

		}



		/* MREMAP_FIXED checked above. */

		new_addr = get_unmapped_area(file, addr, new_len,

				    vma ? vma->vm_pgoff : 0,

				    map_flags);

		ret = new_addr;

		if (new_addr & ~PAGE_MASK)

			goto out_sem;

		flags |= MREMAP_FIXED;

	}

	ret = do_mremap(addr, old_len, new_len, flags, new_addr);

out_sem:

	up_write(&current->mm->mmap_sem);

out:

	return ret;