From: Dmitry Smirnov <onlyjob@debian.org>
Date: Sun, 10 Mar 2019 09:51:44 +0000 (+0000)
Subject: fix FTBFS on i686
X-Git-Tag: archive/raspbian/1.0.0_rc10+dfsg1-1+rpi1~1^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e9c83c51bb50f94ec36bd326fa47528dd95c4b56;p=runc.git

fix FTBFS on i686

Last-Update: 2018-06-16
Forwarded: https://github.com/opencontainers/runc/pull/1821
Bug-Upstream: https://github.com/opencontainers/runc/issues/941

src/github.com/opencontainers/runc/libcontainer/user/user_test.go:448:36: constant 2147483648 overflows int

Gbp-Pq: Name test--fix_TestGetAdditionalGroups.patch
---

diff --git a/libcontainer/user/user.go b/libcontainer/user/user.go
index 7b912bb..38caded 100644
--- a/libcontainer/user/user.go
+++ b/libcontainer/user/user.go
@@ -473,7 +473,7 @@ func GetAdditionalGroups(additionalGroups []string, group io.Reader) ([]int, err
 				return nil, fmt.Errorf("Unable to find group %s", ag)
 			}
 			// Ensure gid is inside gid range.
-			if gid < minId || gid > maxId {
+			if gid < minId || gid >= maxId {
 				return nil, ErrRange
 			}
 			gidMap[gid] = struct{}{}
diff --git a/libcontainer/user/user_test.go b/libcontainer/user/user_test.go
index 24ee559..a4aabdc 100644
--- a/libcontainer/user/user_test.go
+++ b/libcontainer/user/user_test.go
@@ -445,7 +445,7 @@ this is just some garbage data
 	if utils.GetIntSize() > 4 {
 		tests = append(tests, foo{
 			// groups with too large id
-			groups:   []string{strconv.Itoa(1 << 31)},
+			groups:   []string{strconv.Itoa( 1<<31 -1 )},
 			expected: nil,
 			hasError: true,
 		})