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

Commit 530ede14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull second set of s390 patches from Martin Schwidefsky:
 "The main part of this merge are Heikos uaccess patches.  Together with
  commit 09884964 ("mm: do not grow the stack vma just because of an
  overrun on preceding vma") the user string access is hopefully fixed
  for good.

  In addition some bug fixes and two cleanup patches."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/module: fix compile warning
  qdio: remove unused parameters
  s390/uaccess: fix kernel ds access for page table walk
  s390/uaccess: fix strncpy_from_user string length check
  input: disable i8042 PC Keyboard controller for s390
  s390/dis: Fix invalid array size
  s390/uaccess: remove pointless access_ok() checks
  s390/uaccess: fix strncpy_from_user/strnlen_user zero maxlen case
  s390/uaccess: shorten strncpy_from_user/strnlen_user
  s390/dasd: fix unresponsive device after all channel paths were lost
  s390/mm: ignore change bit for vmemmap
  s390/page table dumper: add support for change-recording override bit
parents 6977c6fc 72a6b43e

arch/s390/include/asm/futex.h

+0 −6
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 
	if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))

		oparg = 1 << oparg;



	if (! access_ok (VERIFY_WRITE, uaddr, sizeof(u32)))

		return -EFAULT;



	pagefault_disable();

	ret = uaccess.futex_atomic_op(op, uaddr, oparg, &oldval);

	pagefault_enable();
@@ -40,9 +37,6 @@ static inline int futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr) 
static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,

						u32 oldval, u32 newval)

{

	if (! access_ok (VERIFY_WRITE, uaddr, sizeof(u32)))

		return -EFAULT;



	return uaccess.futex_atomic_cmpxchg(uval, uaddr, oldval, newval);

}

arch/s390/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,8 @@ extern unsigned long MODULES_END; 
#define _REGION3_ENTRY_EMPTY	(_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_INV)



#define _REGION3_ENTRY_LARGE	0x400	/* RTTE-format control, large page  */

#define _REGION3_ENTRY_RO	0x200	/* page protection bit		    */

#define _REGION3_ENTRY_CO	0x100	/* change-recording override	    */



/* Bits in the segment table entry */

#define _SEGMENT_ENTRY_ORIGIN	~0x7ffUL/* segment table origin		    */

arch/s390/include/asm/uaccess.h

+5 −18
Original line number Diff line number Diff line
@@ -252,9 +252,7 @@ static inline unsigned long __must_check 
copy_to_user(void __user *to, const void *from, unsigned long n)

{

	might_fault();

	if (access_ok(VERIFY_WRITE, to, n))

		n = __copy_to_user(to, from, n);

	return n;

	return __copy_to_user(to, from, n);

}



/**
@@ -315,11 +313,7 @@ copy_from_user(void *to, const void __user *from, unsigned long n) 
		copy_from_user_overflow();

		return n;

	}

	if (access_ok(VERIFY_READ, from, n))

		n = __copy_from_user(to, from, n);

	else

		memset(to, 0, n);

	return n;

	return __copy_from_user(to, from, n);

}



static inline unsigned long __must_check
@@ -332,9 +326,7 @@ static inline unsigned long __must_check 
copy_in_user(void __user *to, const void __user *from, unsigned long n)

{

	might_fault();

	if (__access_ok(from,n) && __access_ok(to,n))

		n = __copy_in_user(to, from, n);

	return n;

	return __copy_in_user(to, from, n);

}



/*
@@ -343,11 +335,8 @@ copy_in_user(void __user *to, const void __user *from, unsigned long n) 
static inline long __must_check

strncpy_from_user(char *dst, const char __user *src, long count)

{

        long res = -EFAULT;

	might_fault();

        if (access_ok(VERIFY_READ, src, 1))

		res = uaccess.strncpy_from_user(count, src, dst);

        return res;

	return uaccess.strncpy_from_user(count, src, dst);

}



static inline unsigned long
@@ -387,9 +376,7 @@ static inline unsigned long __must_check 
clear_user(void __user *to, unsigned long n)

{

	might_fault();

	if (access_ok(VERIFY_WRITE, to, n))

		n = uaccess.clear_user(n, to);

	return n;

	return uaccess.clear_user(n, to);

}



extern int copy_to_user_real(void __user *dest, void *src, size_t count);

arch/s390/kernel/compat_signal.c

+0 −14
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) 
{

	int err;



	if (!access_ok (VERIFY_WRITE, to, sizeof(compat_siginfo_t)))

		return -EFAULT;



	/* If you change siginfo_t structure, please be sure

	   this code is fixed accordingly.

	   It should never copy any pad contained in the structure
@@ -110,9 +107,6 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) 
	int err;

	u32 tmp;



	if (!access_ok (VERIFY_READ, from, sizeof(compat_siginfo_t)))

		return -EFAULT;



	err = __get_user(to->si_signo, &from->si_signo);

	err |= __get_user(to->si_errno, &from->si_errno);

	err |= __get_user(to->si_code, &from->si_code);
@@ -244,8 +238,6 @@ asmlinkage long sys32_sigreturn(void) 
	sigframe32 __user *frame = (sigframe32 __user *)regs->gprs[15];

	sigset_t set;



	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))

		goto badframe;

	if (__copy_from_user(&set.sig, &frame->sc.oldmask, _SIGMASK_COPY_SIZE32))

		goto badframe;

	set_current_blocked(&set);
@@ -265,8 +257,6 @@ asmlinkage long sys32_rt_sigreturn(void) 
	rt_sigframe32 __user *frame = (rt_sigframe32 __user *)regs->gprs[15];

	sigset_t set;



	if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))

		goto badframe;

	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))

		goto badframe;

	set_current_blocked(&set);
@@ -325,8 +315,6 @@ static int setup_frame32(int sig, struct k_sigaction *ka, 
			sigset_t *set, struct pt_regs * regs)

{

	sigframe32 __user *frame = get_sigframe(ka, regs, sizeof(sigframe32));

	if (!access_ok(VERIFY_WRITE, frame, sizeof(sigframe32)))

		goto give_sigsegv;



	if (frame == (void __user *) -1UL)

		goto give_sigsegv;
@@ -391,8 +379,6 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, 
{

	int err = 0;

	rt_sigframe32 __user *frame = get_sigframe(ka, regs, sizeof(rt_sigframe32));

	if (!access_ok(VERIFY_WRITE, frame, sizeof(rt_sigframe32)))

		goto give_sigsegv;



	if (frame == (void __user *) -1UL)

		goto give_sigsegv;

arch/s390/kernel/dis.c

+2 −2
Original line number Diff line number Diff line
@@ -1711,10 +1711,10 @@ int insn_to_mnemonic(unsigned char *instruction, char buf[8]) 
	if (!insn)

		return -ENOENT;

	if (insn->name[0] == '\0')

		snprintf(buf, sizeof(buf), "%s",

		snprintf(buf, 8, "%s",

			 long_insn_name[(int) insn->name[1]]);

	else

		snprintf(buf, sizeof(buf), "%.5s", insn->name);

		snprintf(buf, 8, "%.5s", insn->name);

	return 0;

}

EXPORT_SYMBOL_GPL(insn_to_mnemonic);