Cc: Ingo Molnar <redacted>
Cc: Peter Zijlstra <redacted>
Cc: Serge Hallyn <redacted>
Cc: Oleg Nesterov <redacted>
Cc: Andrew Morton <redacted>
Cc: "Eric W. Biederman" <redacted>
Cc: Al Viro <redacted>
Cc: Pavel Emelyanov <redacted>
CC: Cyrill Gorcunov <redacted>
Cc: Michael Kerrisk <redacted>
Signed-off-by: Andrey Vagin <redacted>
---
include/linux/sched.h | 13 ++++++++++++-
kernel/signal.c | 10 ++++++----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 206bb08..45871f1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2221,7 +2221,18 @@ extern void flush_signals(struct task_struct *);
extern void __flush_signals(struct task_struct *);
extern void ignore_signals(struct task_struct *);
extern void flush_signal_handlers(struct task_struct *, int force_default);
-extern int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info);
+
+#define SIGQUEUE_SHARED 1
+#define SIGQUEUE_PRIVATE 2
+extern int do_dequeue_signal(struct task_struct *tsk,
+ sigset_t *mask, siginfo_t *info, int qmask);
+
+static inline int dequeue_signal(struct task_struct *tsk,
+ sigset_t *mask, siginfo_t *info)
+{
+ return do_dequeue_signal(tsk, mask, info,
+ SIGQUEUE_SHARED | SIGQUEUE_PRIVATE);
+}
static inline int dequeue_signal_lock(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
{diff --git a/kernel/signal.c b/kernel/signal.c
index ac5f5e7..1412f6a 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -600,15 +600,17 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
*
* All callers have to hold the siglock.
*/
-int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
+int do_dequeue_signal(struct task_struct *tsk, sigset_t *mask,
+ siginfo_t *info, int qmask)
{
- int signr;
+ int signr = 0;
/* We only dequeue private signals from ourselves, we don't let
* signalfd steal them
*/
- signr = __dequeue_signal(&tsk->pending, mask, info);
- if (!signr) {
+ if (qmask & SIGQUEUE_PRIVATE)
+ signr = __dequeue_signal(&tsk->pending, mask, info);
+ if (!signr && (qmask & SIGQUEUE_SHARED)) {
signr = __dequeue_signal(&tsk->signal->shared_pending,
mask, info);
/*--
1.7.11.7