diff options
| author | Andrew Gerrand <adg@golang.org> | 2014-08-12 09:31:36 +1000 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2014-08-12 09:31:36 +1000 |
| commit | 1798bb298f5339f7aebcac819e70f3314926fcb5 (patch) | |
| tree | bdb95072c6b67f1d2c85cfb65636aa01986373e4 | |
| parent | 0752bc8f26dffccbe536aaa7a5131ca26477c0d6 (diff) | |
| download | go-1798bb298f5339f7aebcac819e70f3314926fcb5.tar.gz go-1798bb298f5339f7aebcac819e70f3314926fcb5.zip | |
[release-branch.go1.3] net: Don't read beyond end of slice when parsing resolv.conf options.
««« CL 102470046 / 5207b394de96
net: Don't read beyond end of slice when parsing resolv.conf options.
Fixes #8252.
LGTM=adg
R=ruiu, josharian, adg
CC=golang-codereviews
https://golang.org/cl/102470046
»»»
TBR=rsc
CC=golang-codereviews
https://golang.org/cl/124140043
| -rw-r--r-- | src/pkg/net/dnsconfig_unix.go | 10 | ||||
| -rw-r--r-- | src/pkg/net/testdata/resolv.conf | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/pkg/net/dnsconfig_unix.go b/src/pkg/net/dnsconfig_unix.go index af288253e0..db45716f12 100644 --- a/src/pkg/net/dnsconfig_unix.go +++ b/src/pkg/net/dnsconfig_unix.go @@ -75,19 +75,19 @@ func dnsReadConfig(filename string) (*dnsConfig, error) { for i := 1; i < len(f); i++ { s := f[i] switch { - case len(s) >= 6 && s[0:6] == "ndots:": + case hasPrefix(s, "ndots:"): n, _, _ := dtoi(s, 6) if n < 1 { n = 1 } conf.ndots = n - case len(s) >= 8 && s[0:8] == "timeout:": + case hasPrefix(s, "timeout:"): n, _, _ := dtoi(s, 8) if n < 1 { n = 1 } conf.timeout = n - case len(s) >= 8 && s[0:9] == "attempts:": + case hasPrefix(s, "attempts:"): n, _, _ := dtoi(s, 9) if n < 1 { n = 1 @@ -103,3 +103,7 @@ func dnsReadConfig(filename string) (*dnsConfig, error) { return conf, nil } + +func hasPrefix(s, prefix string) bool { + return len(s) >= len(prefix) && s[:len(prefix)] == prefix +} diff --git a/src/pkg/net/testdata/resolv.conf b/src/pkg/net/testdata/resolv.conf index b5972e09c9..3841bbf904 100644 --- a/src/pkg/net/testdata/resolv.conf +++ b/src/pkg/net/testdata/resolv.conf @@ -3,3 +3,4 @@ domain Home nameserver 192.168.1.1 options ndots:5 timeout:10 attempts:3 rotate +options attempts 3 |