aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2016-10-06 19:35:04 +0200
committerAxel Davy <[email protected]>2016-10-10 23:43:48 +0200
commit218459771a1801d7ad20dd340ac35a50f2b5b81a (patch)
treeb453dad7cbf09cedbca33259471149160bf99b85 /src
parent9904581dc663543861c05ecf0ddd1a51a934f812 (diff)
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 <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/os/os_misc.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/os/os_misc.c b/src/gallium/auxiliary/os/os_misc.c
index 82e49577352..a32a9e594b8 100644
--- a/src/gallium/auxiliary/os/os_misc.c
+++ b/src/gallium/auxiliary/os/os_misc.c
@@ -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;