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

Commit 2da6dc28 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] cio: Make ccw_device_register() static.
  [S390] Improve AP bus device removal.
  [S390] uaccess error handling.
  [S390] cio: css_probe_device() must be called enabled.
  [S390] Initialize interval value to 0.
  [S390] sys_getcpu compat wrapper.
parents 0c6cb974 3c9da7ba

arch/s390/appldata/appldata_base.c

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ appldata_interval_handler(ctl_table *ctl, int write, struct file *filp, 
	if (copy_from_user(buf, buffer, len > sizeof(buf) ? sizeof(buf) : len)) {

		return -EFAULT;

	}

	interval = 0;

	sscanf(buf, "%i", &interval);

	if (interval <= 0) {

		P_ERROR("Timer CPU interval has to be > 0!\n");

arch/s390/kernel/compat_linux.c

+3 −1
Original line number Diff line number Diff line
@@ -757,7 +757,9 @@ asmlinkage long sys32_sysctl(struct __sysctl_args32 __user *args) 
			    put_user(oldlen, (u32 __user *)compat_ptr(tmp.oldlenp)))

				error = -EFAULT;

		}

		copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));

		if (copy_to_user(args->__unused, tmp.__unused,

				 sizeof(tmp.__unused)))

			error = -EFAULT;

	}

	return error;

}

arch/s390/kernel/compat_signal.c

+6 −6
Original line number Diff line number Diff line
@@ -169,12 +169,12 @@ sys32_sigaction(int sig, const struct old_sigaction32 __user *act, 
		compat_old_sigset_t mask;

		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(sa_handler, &act->sa_handler) ||

		    __get_user(sa_restorer, &act->sa_restorer))

		    __get_user(sa_restorer, &act->sa_restorer) ||

		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;

		new_ka.sa.sa_handler = (__sighandler_t) sa_handler;

		new_ka.sa.sa_restorer = (void (*)(void)) sa_restorer;

		__get_user(new_ka.sa.sa_flags, &act->sa_flags);

		__get_user(mask, &act->sa_mask);

		siginitset(&new_ka.sa.sa_mask, mask);

        }
@@ -185,10 +185,10 @@ sys32_sigaction(int sig, const struct old_sigaction32 __user *act, 
		sa_restorer = (unsigned long) old_ka.sa.sa_restorer;

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(sa_handler, &oact->sa_handler) ||

		    __put_user(sa_restorer, &oact->sa_restorer))

		    __put_user(sa_restorer, &oact->sa_restorer) ||

		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;

		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);

		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);

        }



	return ret;

arch/s390/kernel/compat_wrapper.S

+1 −1
Original line number Diff line number Diff line
@@ -1664,4 +1664,4 @@ sys_getcpu_wrapper: 
	llgtr	%r2,%r2			# unsigned *

	llgtr	%r3,%r3			# unsigned *

	llgtr	%r4,%r4			# struct getcpu_cache *

	jg	sys_tee
 
	jg	sys_getcpu

arch/s390/kernel/signal.c

+6 −6
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, 
		old_sigset_t mask;

		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||

		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;

		__get_user(new_ka.sa.sa_flags, &act->sa_flags);

		__get_user(mask, &act->sa_mask);

		siginitset(&new_ka.sa.sa_mask, mask);

	}
@@ -92,10 +92,10 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, 
	if (!ret && oact) {

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||

		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;

		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);

		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);

	}



	return ret;