patch-2.1.4 linux/kernel/signal.c

• Lines: 28
• Date: Sun Oct 13 21:11:25 1996
• Orig file: v2.1.3/linux/kernel/signal.c
• Orig date: Tue Jul 2 19:08:43 1996

diff -u --recursive --new-file v2.1.3/linux/kernel/signal.c linux/kernel/signal.c
@@ -35,7 +35,8 @@
 		error = verify_area(VERIFY_READ, set, sizeof(sigset_t));
 		if (error)
 			return error;
-		new_set = get_user(set) & _BLOCKABLE;
+		get_user(new_set, set);
+		new_set &= _BLOCKABLE;
 		switch (how) {
 		case SIG_BLOCK:
 			current->blocked |= new_set;
@@ -161,7 +162,7 @@
 			return err;
 		if (signum==SIGKILL || signum==SIGSTOP)
 			return -EINVAL;
-		memcpy_fromfs(&new_sa, action, sizeof(struct sigaction));
+		copy_from_user(&new_sa, action, sizeof(struct sigaction));
 		if (new_sa.sa_handler != SIG_DFL && new_sa.sa_handler != SIG_IGN) {
 			err = verify_area(VERIFY_READ, new_sa.sa_handler, 1);
 			if (err)
@@ -172,7 +173,7 @@
 		int err = verify_area(VERIFY_WRITE, oldaction, sizeof(*oldaction));
 		if (err)
 			return err;
-		memcpy_tofs(oldaction, p, sizeof(struct sigaction));
+		copy_to_user(oldaction, p, sizeof(struct sigaction));
 	}
 	if (action) {
 		*p = new_sa;