Date: Sat, 15 Apr 2017 15:15:42 +0000 (UTC) From: Dmitry Chagin <dchagin@FreeBSD.org> 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 Message-ID: <201704151515.v3FFFgZj083762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704151515.v3FFFgZj083762>