From 3f1a39c442b7786b028b05c81c381acee4edb1a9 Mon Sep 17 00:00:00 2001 From: Li Yuxuan Date: Fri, 8 Nov 2019 20:33:42 +0800 Subject: [PATCH] rootless: Fix rangeUID parsing `rangeUID` should be parsed as ids[2] rather than ids[1] Fixes: #2173 Signed-off-by: Li Yuxuan --- pkg/rootless/rootless.go | 2 +- pkg/rootless/rootless_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go index 9b0d22d525..495fdf19a9 100644 --- a/pkg/rootless/rootless.go +++ b/pkg/rootless/rootless.go @@ -90,7 +90,7 @@ func setRootless() error { if err != nil { return parseError } - rangeUID, err := strconv.ParseUint(ids[1], 10, 0) + rangeUID, err := strconv.ParseUint(ids[2], 10, 0) if err != nil || rangeUID == 0 { return parseError } diff --git a/pkg/rootless/rootless_test.go b/pkg/rootless/rootless_test.go index addfd0e289..1a5289477d 100644 --- a/pkg/rootless/rootless_test.go +++ b/pkg/rootless/rootless_test.go @@ -119,6 +119,7 @@ func TestIsRootless(t *testing.T) { uidMap: []uidMapping{ {0, 0, 0}, {1, 0, 0}, + {0, 1, 0}, {1, 1000, 0}, {1000, 1000, 0}, },