svn commit: r363790 - in stable/12/sys: compat/linuxkpi/common/include/linux sys

[Hans Petter Selasky]

Author: hselasky
Date: Mon Aug  3 09:13:06 2020
New Revision: 363790
URL: https://svnweb.freebsd.org/changeset/base/363790

Log:
  MFC r363077:
  Implement the array_size() function in the LinuxKPI. This function
  basically multiplies its two arguments and returns SIZE_MAX if the
  result overflows the size_t type.  Else the product of the two
  arguments is returned.
  
  Bump the FreeBSD_version to mitigate issues with existing
  implementation of array_size() in drm-devel-kmod.
  
  Discussed with:		manu@
  Sponsored by:		Mellanox Technologies

Modified:
  stable/12/sys/compat/linuxkpi/common/include/linux/overflow.h
  stable/12/sys/sys/param.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/overflow.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/overflow.h	Mon Aug  3 09:11:10 2020	(r363789)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/overflow.h	Mon Aug  3 09:13:06 2020	(r363790)
@@ -31,6 +31,9 @@
 #ifndef __LINUX_OVERFLOW_H__
 #define	__LINUX_OVERFLOW_H__
 
+#include <sys/stdint.h>
+#include <sys/types.h>
+
 #ifndef	__has_builtin
 #define	__has_builtin(x)	0
 #endif
@@ -45,6 +48,16 @@
 #if __has_builtin(__builtin_mul_overflow)
 #define check_mul_overflow(a, b, c)	\
 	__builtin_mul_overflow(a, b, c)
+
+static inline size_t
+array_size(size_t x, size_t y)
+{
+	size_t retval;
+
+	if (__builtin_mul_overflow(x, y, &retval))
+		retval = SIZE_MAX;
+	return (retval);
+}
 #else
 #error "Compiler does not support __builtin_mul_overflow"
 #endif

Modified: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Mon Aug  3 09:11:10 2020	(r363789)
+++ stable/12/sys/sys/param.h	Mon Aug  3 09:13:06 2020	(r363790)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1201520	/* Master, propagated to newvers */
+#define __FreeBSD_version 1201521	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,