aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-06-29 16:44:45 -0400
committerRuss Cox <rsc@golang.org>2015-06-30 19:40:39 +0000
commit6f80e5edf464fe5321acb2b4994951fe7edfff7e (patch)
tree5c04a645ee50395548b678e137496638e10f13d6 /src
parente8f2eb43492df599efd65a2e01e9e8618fe46632 (diff)
downloadgo-6f80e5edf464fe5321acb2b4994951fe7edfff7e.tar.xz
cmd/link: reject data size > 2 GB
We can't address more than this on amd64 anyway. Fixes #9862. Change-Id: Ifb1abae558e2e1ee2dc953a76995f3f08c60b1df Reviewed-on: https://go-review.googlesource.com/11715 Reviewed-by: Austin Clements <austin@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/link/internal/ld/data.go13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
index 60b0be5ceb..ab92b9430f 100644
--- a/src/cmd/link/internal/ld/data.go
+++ b/src/cmd/link/internal/ld/data.go
@@ -1122,11 +1122,14 @@ func (p *GCProg) AddSym(s *LSym) {
func growdatsize(datsizep *int64, s *LSym) {
datsize := *datsizep
- if s.Size < 0 {
- Diag("negative size (datsize = %d, s->size = %d)", datsize, s.Size)
- }
- if datsize+s.Size < datsize {
- Diag("symbol too large (datsize = %d, s->size = %d)", datsize, s.Size)
+ const cutoff int64 = 2e9 // 2 GB (or so; looks better in errors than 2^31)
+ switch {
+ case s.Size < 0:
+ Diag("%s: negative size (%d bytes)", s.Name, s.Size)
+ case s.Size > cutoff:
+ Diag("%s: symbol too large (%d bytes)", s.Name, s.Size)
+ case datsize <= cutoff && datsize+s.Size > cutoff:
+ Diag("%s: too much data (over %d bytes)", s.Name, cutoff)
}
*datsizep = datsize + s.Size
}