From owner-svn-src-all@freebsd.org  Sat Dec 26 09:09:50 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83BE1A51AA7;
 Sat, 26 Dec 2015 09:09:50 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 54A3F197A;
 Sat, 26 Dec 2015 09:09:50 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBQ99nSq055752;
 Sat, 26 Dec 2015 09:09:49 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBQ99n6J055751;
 Sat, 26 Dec 2015 09:09:49 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201512260909.tBQ99n6J055751@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dchagin set sender to
 dchagin@FreeBSD.org using -f
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 26 Dec 2015 09:09:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292744 - head/sys/compat/linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Dec 2015 09:09:50 -0000

Author: dchagin
Date: Sat Dec 26 09:09:49 2015
New Revision: 292744
URL: https://svnweb.freebsd.org/changeset/base/292744

Log:
  Return EINVAL in case of incorrect sigev_signo value specified instead of panicing.

Modified:
  head/sys/compat/linux/linux_timer.c

Modified: head/sys/compat/linux/linux_timer.c
==============================================================================
--- head/sys/compat/linux/linux_timer.c	Sat Dec 26 09:04:47 2015	(r292743)
+++ head/sys/compat/linux/linux_timer.c	Sat Dec 26 09:09:49 2015	(r292744)
@@ -57,6 +57,8 @@ linux_convert_l_sigevent(struct l_sigeve
 	CP(*l_sig, *sig, sigev_notify);
 	switch (l_sig->sigev_notify) {
 	case L_SIGEV_SIGNAL:
+		if (!LINUX_SIG_VALID(l_sig->sigev_signo))
+			return (EINVAL);
 		sig->sigev_notify = SIGEV_SIGNAL;
 		sig->sigev_signo = linux_to_bsd_signal(l_sig->sigev_signo);
 		PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr);
@@ -73,6 +75,8 @@ linux_convert_l_sigevent(struct l_sigeve
 		return (EINVAL);
 #endif
 	case L_SIGEV_THREAD_ID:
+		if (!LINUX_SIG_VALID(l_sig->sigev_signo))
+			return (EINVAL);
 		sig->sigev_notify = SIGEV_THREAD_ID;
 		CP2(*l_sig, *sig, _l_sigev_un._tid, sigev_notify_thread_id);
 		sig->sigev_signo = linux_to_bsd_signal(l_sig->sigev_signo);