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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
