Date: Fri, 7 Apr 2017 05:37:08 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316599 - head/sys/compat/linux Message-ID: <201704070537.v375b8Bg068573@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704070537.v375b8Bg068573>