[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.0804101212340.9668@alien.or.mcafeemobile.com>
Date: Thu, 10 Apr 2008 12:13:22 -0700 (PDT)
From: Davide Libenzi <davidel@...ilserver.org>
To: Andrew Morton <akpm@...ux-foundation.org>
cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
mtk.manpages@...glemail.com, stable@...nel.org
Subject: Re: [patch] signalfd fix for incorrect SI_QUEUE user data reporting
On Thu, 10 Apr 2008, Andrew Morton wrote:
> On Thu, 10 Apr 2008 11:57:44 -0700 (PDT)
> Davide Libenzi <davidel@...ilserver.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@...ilserver.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?
Looks safe for me.
- Davide
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists