---

yaml --- r: 347780 b: refs/heads/master c: 5c49574 h: refs/heads/master v: v3
git-mirror · Dec 19, 2012 · aac7f35 · aac7f35
1 parent 9b65f15
commit aac7f35
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 031b6566983ad9c0247087f039af22b3f87596a3
+refs/heads/master: 5c49574ffd7ac07eae8c3b065d19e6ebc7e4760f
diff --git a/trunk/include/linux/signal.h b/trunk/include/linux/signal.h
@@ -385,4 +385,6 @@ int unhandled_signal(struct task_struct *tsk, int sig);
 
 void signals_init(void);
 
+int restore_altstack(const stack_t __user *);
+
 #endif /* _LINUX_SIGNAL_H */
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -3103,6 +3103,13 @@ do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long s
 	return error;
 }
 
+int restore_altstack(const stack_t __user *uss)
+{
+	int err = do_sigaltstack(uss, NULL, current_user_stack_pointer());
+	/* squash all but EFAULT for now */
+	return err == -EFAULT ? err : 0;
+}
+
 #ifdef __ARCH_WANT_SYS_SIGPENDING
 
 /**
Original file line number	Diff line number	Diff line change
Expand Up		@@ -385,4 +385,6 @@ int unhandled_signal(struct task_struct *tsk, int sig);

		void signals_init(void);

		int restore_altstack(const stack_t __user *);

		#endif /* _LINUX_SIGNAL_H */