Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0859ab59 authored by Davide Libenzi's avatar Davide Libenzi Committed by Linus Torvalds
Browse files

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: default avatarDavide Libenzi <davidel@xmailserver.org>
Acked-by: default avatarMichael Kerrisk <mtk.manpages@googlemail.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 544451a1

fs/signalfd.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -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(kinfo->si_uid, &uinfo->ssi_uid);

		err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr);

		err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr);

		break;

		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_pid, &uinfo->ssi_pid);

		err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid);

		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;

		break;

	}

	}