From owner-svn-src-user@FreeBSD.ORG  Fri Mar  8 19:16:25 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 2350CEBB;
 Fri,  8 Mar 2013 19:16:25 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 15DBA730;
 Fri,  8 Mar 2013 19:16:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r28JGOZB031422;
 Fri, 8 Mar 2013 19:16:24 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r28JGObS031421;
 Fri, 8 Mar 2013 19:16:24 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201303081916.r28JGObS031421@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Fri, 8 Mar 2013 19:16:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248065 - user/dchagin/lemul/sys/compat/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Mar 2013 19:16:25 -0000

Author: dchagin
Date: Fri Mar  8 19:16:24 2013
New Revision: 248065
URL: http://svnweb.freebsd.org/changeset/base/248065

Log:
  User can specify the NULL value for the sigmask parameter.

Modified:
  user/dchagin/lemul/sys/compat/linux/linux_misc.c

Modified: user/dchagin/lemul/sys/compat/linux/linux_misc.c
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_misc.c	Fri Mar  8 19:02:45 2013	(r248064)
+++ user/dchagin/lemul/sys/compat/linux/linux_misc.c	Fri Mar  8 19:16:24 2013	(r248065)
@@ -2089,19 +2089,22 @@ linux_pselect6(struct thread *td, struct
 	sigset_t ss;
 	int error;
 
+	ssp = NULL;
 	if (args->sig) {
 		error = copyin(args->sig, &lpse6, sizeof(lpse6));
 		if (error)
 			return (error);
 		if (lpse6.ss_len != sizeof(l_ss))
 			return (EINVAL);
-		error = copyin(PTRIN(lpse6.ss), &l_ss, sizeof(l_ss));
-		if (error)
-			return (error);
-		linux_to_bsd_sigset(&l_ss, &ss);
-		ssp = &ss;
-	} else
-		ssp = NULL;
+		if (lpse6.ss != 0) {
+			error = copyin(PTRIN(lpse6.ss), &l_ss,
+			    sizeof(l_ss));
+			if (error)
+				return (error);
+			linux_to_bsd_sigset(&l_ss, &ss);
+			ssp = &ss;
+		}
+	}
 
 	/*
 	 * Currently glibc changes nanosecond number to microsecond.