From: Jose Fonseca <jfonseca@vmware.com>
Date: Wed, 22 Apr 2015 19:23:59 +0000 (+0100)
Subject: os/os_memory_aligned.h: Handle integer overflow.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=525be9c0791e4a447335307b5f225273b9da0cca;p=mesa.git

os/os_memory_aligned.h: Handle integer overflow.

This code is only used when our memory debugging wrappers are enabled,
as we use the C runtime functions directly elsewhere.

Tested llvmpipe on Windows w/ memory debugging enabled.

VMware PR894263.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/gallium/auxiliary/os/os_memory_aligned.h b/src/gallium/auxiliary/os/os_memory_aligned.h
index 72c5cf65b66..bb15f24ade3 100644
--- a/src/gallium/auxiliary/os/os_memory_aligned.h
+++ b/src/gallium/auxiliary/os/os_memory_aligned.h
@@ -39,6 +39,19 @@
 #include "pipe/p_compiler.h"
 
 
+
+/**
+ * Add two size_t values with integer overflow check.
+ * TODO: leverage __builtin_add_overflow where available
+ */
+static inline bool
+add_overflow_size_t(size_t a, size_t b, size_t *res)
+{
+   *res = a + b;
+   return *res < a || *res < b;
+}
+
+
 /**
  * Return memory on given byte alignment
  */
@@ -46,8 +59,21 @@ static INLINE void *
 os_malloc_aligned(size_t size, size_t alignment)
 {
    char *ptr, *buf;
+   size_t alloc_size;
+
+   /*
+    * Calculate
+    *
+    *   alloc_size = size + alignment + sizeof(void *)
+    *
+    * while checking for overflow.
+    */
+   if (add_overflow_size_t(size, alignment, &alloc_size) ||
+       add_overflow_size_t(alloc_size, sizeof(void *), &alloc_size)) {
+      return NULL;
+   }
 
-   ptr = (char *) os_malloc(size + alignment + sizeof(void *));
+   ptr = (char *) os_malloc(alloc_size);
    if (!ptr)
       return NULL;