runtime: Better detection of memory allocation request overflow.

From-SVN: r191841

diff --git a/libgo/runtime/chan.c b/libgo/runtime/chan.c
index c8ee10e8c8898c1ea58c573872bd6dd6bedfdc7f..d0a1612ad2a9ebc6767b6dcf248d3029a76934ab 100644 (file)
--- a/libgo/runtime/chan.c
+++ b/libgo/runtime/chan.c
@@ -3,6 +3,8 @@
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
+#include "arch.h"
+#include "malloc.h"
 #include "go-type.h"
 
 #define        NOSELGEN        1
@@ -88,7 +90,7 @@ runtime_makechan_c(ChanType *t, int64 hint)
        
        elem = t->__element_type;
 
-       if(hint < 0 || (int32)hint != hint || (elem->__size > 0 && (uintptr)hint > ((uintptr)-1) / elem->__size))
+       if(hint < 0 || (int32)hint != hint || (elem->__size > 0 && (uintptr)hint > MaxMem / elem->__size))
                runtime_panicstring("makechan: size out of range");
 
        n = sizeof(*c);

diff --git a/libgo/runtime/go-append.c b/libgo/runtime/go-append.c
index 3a0c77811262989e80e44e55c6c239d01376f6c6..dac4c902c154de5078cf9cb8c6df2cb90b66eeb5 100644 (file)
--- a/libgo/runtime/go-append.c
+++ b/libgo/runtime/go-append.c
@@ -54,6 +54,9 @@ __go_append (struct __go_open_array a, void *bvalues, uintptr_t bcount,
          while (m < count);
        }
 
+      if ((uintptr) m > MaxMem / element_size)
+       runtime_panicstring ("growslice: cap out of range");
+
       n = __go_alloc (m * element_size);
       __builtin_memcpy (n, a.__values, a.__count * element_size);
 

diff --git a/libgo/runtime/go-make-slice.c b/libgo/runtime/go-make-slice.c
index 42b412c772b000b2b033d2e537c8ae7ef0645768..822c9b68f0a43873b1c7f9609a8ba1e8b3deb846 100644 (file)
--- a/libgo/runtime/go-make-slice.c
+++ b/libgo/runtime/go-make-slice.c
@@ -37,7 +37,7 @@ __go_make_slice2 (const struct __go_type_descriptor *td, uintptr_t len,
   if (cap < len
       || (uintptr_t) icap != cap
       || (std->__element_type->__size > 0
-         && cap > (uintptr_t) -1U / std->__element_type->__size))
+         && cap > MaxMem / std->__element_type->__size))
     runtime_panicstring ("makeslice: cap out of range");
 
   ret.__count = ilen;

diff --git a/libgo/runtime/malloc.h b/libgo/runtime/malloc.h
index 16bb449f128b812041f94b8b321dbc98c26bc17b..96cb609367fcb9ddd7089bb7b30bdbd4f3355929 100644 (file)
--- a/libgo/runtime/malloc.h
+++ b/libgo/runtime/malloc.h
@@ -128,6 +128,15 @@ enum
        MaxGcproc = 4,
 };
 
+// Maximum memory allocation size, a hint for callers.
+// This must be a #define instead of an enum because it
+// is so large.
+#if __SIZEOF_POINTER__ == 8
+#define        MaxMem  (16ULL<<30)     /* 16 GB */
+#else
+#define        MaxMem  ((uintptr)-1)
+#endif
+
 // A generic linked list of blocks.  (Typically the block is bigger than sizeof(MLink).)
 struct MLink
 {