d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement the array_size() function in the LinuxKPI. This function

Browse Source 
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@
MFC after:		1 week
Sponsored by:		Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2020-07-10 11:27:54 +00:00
parent 6ddc843832
commit d2890eeea1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=363077
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/compat/linuxkpi/common/include/linux/overflow.h
View File

@ -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

2
sys/sys/param.h
View File

@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
#define __FreeBSD_version 1300100 /* Master, propagated to newvers */
#define __FreeBSD_version 1300101 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,