import golang-1.15.14-2.module+el8.4.0+12542+e3fec473

This commit is contained in:
CentOS Sources 2021-09-21 03:15:19 -04:00 committed by Stepan Oksanichenko
parent a028a37361
commit ceb919b0e0
2 changed files with 129 additions and 1 deletions

View File

@ -0,0 +1,110 @@
diff --git a/doc/go1.15.html b/doc/go1.15.html
index c9997c0..c2315f1 100644
--- a/doc/go1.15.html
+++ b/doc/go1.15.html
@@ -795,6 +795,15 @@ Do not send CLs removing the interior tags from such phrases.
The new <a href="/pkg/net/#Resolver.LookupIP"><code>Resolver.LookupIP</code></a>
method supports IP lookups that are both network-specific and accept a context.
</p>
+
+ <p><!-- CL325829 -->
+ The <a href="/pkg/net/#ParseIP"><code>ParseIP</code></a> and <a href="/pkg/net/#ParseCIDR"><code>ParseCIDR</code></a>
+ functions now reject IPv4 addresses which contain decimal components with leading zeros.
+ These components were always interpreted as decimal, but some operating systems treat them as octal.
+ This mismatch could hypothetically lead to security issues if a Go application was used to validate IP addresses
+ which were then used in their original form with non-Go applications which interpreted components as octal. Generally,
+ it is advisable to always re-encoded values after validation, which avoids this class of parser misalignment issues.
+ </p>
</dd>
</dl>
diff --git a/src/net/hosts_test.go b/src/net/hosts_test.go
index f850e2f..19c4399 100644
--- a/src/net/hosts_test.go
+++ b/src/net/hosts_test.go
@@ -36,7 +36,7 @@ var lookupStaticHostTests = []struct {
},
},
{
- "testdata/ipv4-hosts", // see golang.org/issue/8996
+ "testdata/ipv4-hosts",
[]staticHostEntry{
{"localhost", []string{"127.0.0.1", "127.0.0.2", "127.0.0.3"}},
{"localhost.localdomain", []string{"127.0.0.3"}},
@@ -102,7 +102,7 @@ var lookupStaticAddrTests = []struct {
},
},
{
- "testdata/ipv4-hosts", // see golang.org/issue/8996
+ "testdata/ipv4-hosts",
[]staticHostEntry{
{"127.0.0.1", []string{"localhost"}},
{"127.0.0.2", []string{"localhost"}},
diff --git a/src/net/ip.go b/src/net/ip.go
index c00fe8e..007f3f7 100644
--- a/src/net/ip.go
+++ b/src/net/ip.go
@@ -552,6 +552,10 @@ func parseIPv4(s string) IP {
if !ok || n > 0xFF {
return nil
}
+ if c > 1 && s[0] == '0' {
+ // Reject non-zero components with leading zeroes.
+ return nil
+ }
s = s[c:]
p[i] = byte(n)
}
diff --git a/src/net/ip_test.go b/src/net/ip_test.go
index a5fc5e6..585381d 100644
--- a/src/net/ip_test.go
+++ b/src/net/ip_test.go
@@ -20,9 +20,7 @@ var parseIPTests = []struct {
}{
{"127.0.1.2", IPv4(127, 0, 1, 2)},
{"127.0.0.1", IPv4(127, 0, 0, 1)},
- {"127.001.002.003", IPv4(127, 1, 2, 3)},
{"::ffff:127.1.2.3", IPv4(127, 1, 2, 3)},
- {"::ffff:127.001.002.003", IPv4(127, 1, 2, 3)},
{"::ffff:7f01:0203", IPv4(127, 1, 2, 3)},
{"0:0:0:0:0000:ffff:127.1.2.3", IPv4(127, 1, 2, 3)},
{"0:0:0:0:000000:ffff:127.1.2.3", IPv4(127, 1, 2, 3)},
@@ -42,6 +40,11 @@ var parseIPTests = []struct {
{"fe80::1%911", nil},
{"", nil},
{"a1:a2:a3:a4::b1:b2:b3:b4", nil}, // Issue 6628
+ {"127.001.002.003", nil},
+ {"::ffff:127.001.002.003", nil},
+ {"123.000.000.000", nil},
+ {"1.2..4", nil},
+ {"0123.0.0.1", nil},
}
func TestParseIP(t *testing.T) {
@@ -357,6 +360,7 @@ var parseCIDRTests = []struct {
{"0.0.-2.0/32", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.-2.0/32"}},
{"0.0.0.-3/32", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.0.-3/32"}},
{"0.0.0.0/-0", nil, nil, &ParseError{Type: "CIDR address", Text: "0.0.0.0/-0"}},
+ {"127.000.000.001/32", nil, nil, &ParseError{Type: "CIDR address", Text: "127.000.000.001/32"}},
{"", nil, nil, &ParseError{Type: "CIDR address", Text: ""}},
}
diff --git a/src/net/testdata/ipv4-hosts b/src/net/testdata/ipv4-hosts
index 5208bb4..6b99675 100644
--- a/src/net/testdata/ipv4-hosts
+++ b/src/net/testdata/ipv4-hosts
@@ -1,12 +1,8 @@
# See https://tools.ietf.org/html/rfc1123.
-#
-# The literal IPv4 address parser in the net package is a relaxed
-# one. It may accept a literal IPv4 address in dotted-decimal notation
-# with leading zeros such as "001.2.003.4".
# internet address and host name
127.0.0.1 localhost # inline comment separated by tab
-127.000.000.002 localhost # inline comment separated by space
+127.0.0.2 localhost # inline comment separated by space
# internet address, host name and aliases
-127.000.000.003 localhost localhost.localdomain
+127.0.0.3 localhost localhost.localdomain

View File

@ -101,7 +101,7 @@
Name: golang Name: golang
Version: %{go_version} Version: %{go_version}
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Go Programming Language Summary: The Go Programming Language
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
License: BSD and Public Domain License: BSD and Public Domain
@ -162,6 +162,11 @@ Patch224: net-http-graceful-shutdown.patch
# https://go-review.googlesource.com/c/text/+/238238 # https://go-review.googlesource.com/c/text/+/238238
Patch225: x-text-infinite-loop.patch Patch225: x-text-infinite-loop.patch
# Fix incorrect parsing of extraneous zeros in net/ip
# https://bugzilla.redhat.com/show_bug.cgi?id=1994010
# https://go-review.googlesource.com/c/go/+/325829
Patch1994010: reject-leading-zeros.patch
# Fix FIPS mode memory leaks # Fix FIPS mode memory leaks
Patch1951877: fix-crypto-memory-leaks.patch Patch1951877: fix-crypto-memory-leaks.patch
@ -266,6 +271,8 @@ Requires: %{name} = %{version}-%{release}
%patch225 -p1 %patch225 -p1
%patch1994010 -p1
%patch1951877 -p1 %patch1951877 -p1
cp %{SOURCE1} ./src/runtime/ cp %{SOURCE1} ./src/runtime/
@ -534,6 +541,17 @@ cd ..
%endif %endif
%changelog %changelog
* Wed Sep 8 2021 David Benoit <dbenoit@redhat.com> - 1.15.14-2
- Revert to Go 1.15.14
- Related: rhbz#1995126
- Reverts: rhbz#1994087
* Tue Aug 17 2021 David Benoit <dbenoit@redhat.com> - 1.15.15-1
- Rebase to Go 1.15.15
- Resolves: rhbz#1994087
- Add reject leading zeros patch
- Resolves: rhbz#1994010
* Thu Jul 15 2021 David Benoit <dbenoit@redhat.com> - 1.15.14-1 * Thu Jul 15 2021 David Benoit <dbenoit@redhat.com> - 1.15.14-1
- Rebase to go-1.15.14-1-openssl-fips - Rebase to go-1.15.14-1-openssl-fips
- Resolves: rhbz#1982287 - Resolves: rhbz#1982287