From 745815719954b2012996bf9f9a2ac197e269fc7b Mon Sep 17 00:00:00 2001 From: Davide Libenzi Date: Thu, 10 Apr 2008 21:29:29 -0700 Subject: [PATCH] --- yaml --- r: 88250 b: refs/heads/master c: 0859ab59a8a48d2a96b9d2b7100889bcb6bb5818 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/signalfd.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 18259bf1c3c7..28aa48bfe655 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 544451a1a36b06f43fc67112ede3b92e6203eb9d +refs/heads/master: 0859ab59a8a48d2a96b9d2b7100889bcb6bb5818 diff --git a/trunk/fs/signalfd.c b/trunk/fs/signalfd.c index cb2b63ae0bf4..8ead0db35933 100644 --- a/trunk/fs/signalfd.c +++ b/trunk/fs/signalfd.c @@ -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; }