lkml.org 
[lkml]   [2008]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [patch] signalfd fix for incorrect SI_QUEUE user data reporting
On Thu, 10 Apr 2008 11:57:44 -0700 (PDT)
Davide Libenzi <davidel@xmailserver.org> wrote:

> 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 to report back the ssi_ptr and ssi_int
> members of the signalfd_siginfo structure.
>
>
>
> Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
>
>
> - Davide
>
>
> ---
> fs/signalfd.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> Index: linux-2.6.mod/fs/signalfd.c
> ===================================================================
> --- linux-2.6.mod.orig/fs/signalfd.c 2008-04-09 11:53:37.000000000 -0700
> +++ linux-2.6.mod/fs/signalfd.c 2008-04-09 12:05:46.000000000 -0700
> @@ -111,9 +111,14 @@
> 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;
> }
>

I queued this for both 2.6.25 and 2.6.24.x. Agree?


\
 
 \ /
  Last update: 2008-04-10 21:11    [from the cache]
©2003-2011 Jasper Spaans