gallium/os: Fix overflow on 32 bits
authorAxel Davy <axel.davy@ens.fr>
Thu, 6 Oct 2016 17:35:04 +0000 (19:35 +0200)
committerAxel Davy <axel.davy@ens.fr>
Mon, 10 Oct 2016 21:43:48 +0000 (23:43 +0200)
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>
src/gallium/auxiliary/os/os_misc.c

index 82e4957735230d704f8cc5e45a405321cfd6fa47..a32a9e594b8dd4f9cc3c593d03f6da81d4cbcf63 100644 (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;