From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757454AbYDJTOU (ORCPT ); Thu, 10 Apr 2008 15:14:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751821AbYDJTON (ORCPT ); Thu, 10 Apr 2008 15:14:13 -0400 Received: from x35.xmailserver.org ([64.71.152.41]:42060 "EHLO x35.xmailserver.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751678AbYDJTOM (ORCPT ); Thu, 10 Apr 2008 15:14:12 -0400 X-AuthUser: davidel@xmailserver.org Date: Thu, 10 Apr 2008 12:13:22 -0700 (PDT) From: Davide Libenzi X-X-Sender: davide@alien.or.mcafeemobile.com To: Andrew Morton cc: Linux Kernel Mailing List , mtk.manpages@googlemail.com, stable@kernel.org Subject: Re: [patch] signalfd fix for incorrect SI_QUEUE user data reporting In-Reply-To: <20080410120845.8e7132d8.akpm@linux-foundation.org> Message-ID: References: <20080410120845.8e7132d8.akpm@linux-foundation.org> X-GPG-FINGRPRINT: CFAE 5BEE FD36 F65E E640 56FE 0974 BF23 270F 474E X-GPG-PUBLIC_KEY: http://www.xmailserver.org/davidel.asc MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 10 Apr 2008, Andrew Morton wrote: > On Thu, 10 Apr 2008 11:57:44 -0700 (PDT) > Davide Libenzi 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 > > > > > > - 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