From owner-svn-src-all@freebsd.org  Sat Apr 15 15:15:43 2017
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 B09D9D3E89C;
 Sat, 15 Apr 2017 15:15:43 +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 80411F98;
 Sat, 15 Apr 2017 15:15:43 +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 v3FFFgrF083763;
 Sat, 15 Apr 2017 15:15:42 GMT (envelope-from dchagin@FreeBSD.org)
Received: (from dchagin@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3FFFgZj083762;
 Sat, 15 Apr 2017 15:15:42 GMT (envelope-from dchagin@FreeBSD.org)
Message-Id: <201704151515.v3FFFgZj083762@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, 15 Apr 2017 15:15:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r316965 - stable/11/sys/compat/linux
X-SVN-Group: stable-11
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.23
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, 15 Apr 2017 15:15:43 -0000

Author: dchagin
Date: Sat Apr 15 15:15:42 2017
New Revision: 316965
URL: https://svnweb.freebsd.org/changeset/base/316965

Log:
  MFC r316599:
  
  Prevent ushort values overflow when convert new Linux 64-bit ipc
  struct to the old Linux ipc struct.

Modified:
  stable/11/sys/compat/linux/linux_ipc.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linux/linux_ipc.c
==============================================================================
--- stable/11/sys/compat/linux/linux_ipc.c	Sat Apr 15 15:13:54 2017	(r316964)
+++ stable/11/sys/compat/linux/linux_ipc.c	Sat Apr 15 15:15:42 2017	(r316965)
@@ -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;