mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
signalfd: fix for incorrect SI_QUEUE user data reporting
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>
This commit is contained in:
parent
544451a1a3
commit
0859ab59a8
|
@ -111,9 +111,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue