From owner-svn-src-head@freebsd.org  Fri Apr  7 05:37:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 9006CD322D2;
 Fri,  7 Apr 2017 05:37:10 +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 5AAEF133;
 Fri,  7 Apr 2017 05:37:10 +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 v375b8CL068574;
 Fri, 7 Apr 2017 05:37:08 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v375b8Bg068573;
 Fri, 7 Apr 2017 05:37:08 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201704070537.v375b8Bg068573@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: Fri, 7 Apr 2017 05:37:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316599 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Apr 2017 05:37:10 -0000

Author: dchagin
Date: Fri Apr  7 05:37:08 2017
New Revision: 316599
URL: https://svnweb.freebsd.org/changeset/base/316599

Log:
  Prevent ushort values overflow when convert new Linux 64-bit ipc
  struct to the old Linux ipc struct.
  
  Reported by:	PVS-Studio
  XMFC with:	r314866
  
  MFC after:	3 days

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

Modified: head/sys/compat/linux/linux_ipc.c
==============================================================================
--- head/sys/compat/linux/linux_ipc.c	Fri Apr  7 05:00:09 2017	(r316598)
+++ head/sys/compat/linux/linux_ipc.c	Fri Apr  7 05:37:08 2017	(r316599)
@@ -348,11 +348,11 @@ linux_msqid_pushdown(l_int ver, struct l
 			linux_msqid.msg_cbytes = linux_msqid64->msg_cbytes;
 		linux_msqid.msg_lcbytes = linux_msqid64->msg_cbytes;
 		if (linux_msqid64->msg_qnum > USHRT_MAX)
-			linux_msqid.msg_qnum = linux_msqid64->msg_qnum;
+			linux_msqid.msg_qnum = USHRT_MAX;
 		else
 			linux_msqid.msg_qnum = linux_msqid64->msg_qnum;
 		if (linux_msqid64->msg_qbytes > USHRT_MAX)
-			linux_msqid.msg_qbytes = linux_msqid64->msg_qbytes;
+			linux_msqid.msg_qbytes = USHRT_MAX;
 		else
 			linux_msqid.msg_qbytes = linux_msqid64->msg_qbytes;
 		linux_msqid.msg_lqbytes = linux_msqid64->msg_qbytes;