diff options
| author | Davide Libenzi <davidel@xmailserver.org> | 2008-04-11 16:55:04 +0000 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2008-04-18 18:53:29 -0700 |
| commit | c9c5091171cbf780bb293e6406dd8632b678bae8 (patch) | |
| tree | eb66adfe48f11b651aa418d19d0954031ffe4951 /fs | |
| parent | b895b7886c143e446b8b222a19f10cb0890faae6 (diff) | |
signalfd: fix for incorrect SI_QUEUE user data reporting
upstream commit: 0859ab59a8a48d2a96b9d2b7100889bcb6bb5818
Michael Kerrisk found out that signalfd was not reporting back user data
pushed using sigqueue:
http://groups.google.com/group/linux.kernel/msg/9397cab8551e3123
The following patch makes signalfd report back the ssi_ptr and ssi_int members
of the signalfd_siginfo structure.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
Acked-by: Michael Kerrisk <mtk.manpages@googlemail.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/signalfd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/signalfd.c b/fs/signalfd.c index fb7f7e8034df..1b414eff66e9 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -110,9 +110,14 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); break; - default: /* this is just in case for now ... */ + default: + /* + * This case catches also the signals queued by sigqueue(). + */ err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); + err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); + err |= __put_user(kinfo->si_int, &uinfo->ssi_int); break; } |