KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/os: Fix overflow on 32 bits 

On systems with more than 4GB of ram,
os_get_total_physical_memory was triggering an integer
overflow for the linux and haiku path, when on
32 bits.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94561

Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Axel Davy 2016-10-06 19:35:04 +02:00
parent 9904581dc6
commit 218459771a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gallium/auxiliary/os/os_misc.c
View File

@ -128,8 +128,11 @@ os_get_total_physical_memory(uint64_t *size)
const long phys_pages = sysconf(_SC_PHYS_PAGES);
const long page_size = sysconf(_SC_PAGE_SIZE);
*size = phys_pages * page_size;
return (phys_pages > 0 && page_size > 0);
if (phys_pages <= 0 || page_size <= 0)
return false;
*size = (int64_t)phys_pages * (int64_t)page_size;
return true;
#elif defined(PIPE_OS_APPLE) || defined(PIPE_OS_BSD)
size_t len = sizeof(*size);
int mib[2];
@ -153,8 +156,11 @@ os_get_total_physical_memory(uint64_t *size)
status_t ret;
ret = get_system_info(&info);
*size = info.max_pages * B_PAGE_SIZE;
return (ret == B_OK);
if (ret != B_OK || info.max_pages <= 0)
return false;
*size = (int64_t)info.max_pages * (int64_t)B_PAGE_SIZE;
return true;
#elif defined(PIPE_OS_WINDOWS)
MEMORYSTATUSEX status;
BOOL ret;