dns/dnsmessage: reject names with dots inside label

Fixes golang/go#56246

Change-Id: I9c8d611d1305536a7510bf6c4a02a5e551aa657a
GitHub-Last-Rev: 8a8703a
GitHub-Pull-Request: golang#154
Reviewed-on: https://go-review.googlesource.com/c/net/+/443215
TryBot-Result: Gopher Robot <[email protected]>
Reviewed-by: Roland Shoemaker <[email protected]>
Reviewed-by: Matthew Dempsky <[email protected]>
Run-TryBot: Mateusz Poliwczak <[email protected]>
Auto-Submit: Roland Shoemaker <[email protected]>

Author: mateusz834

dns/dnsmessage/message.go

@@ -260,6 +260,7 @@ var (
 	errReserved           = errors.New("segment prefix is reserved")
 	errTooManyPtr         = errors.New("too many pointers (>10)")
 	errInvalidPtr         = errors.New("invalid pointer")
+	errInvalidName        = errors.New("invalid dns name")
 	errNilResouceBody     = errors.New("nil resource body")
 	errResourceLen        = errors.New("insufficient data for resource body length")
 	errSegTooLong         = errors.New("segment length too long")
@@ -2034,6 +2035,15 @@ Loop:
 			if endOff > len(msg) {
 				return off, errCalcLen
 			}
+
+			// Reject names containing dots.
+			// See issue golang/go#56246
+			for _, v := range msg[currOff:endOff] {
+				if v == '.' {
+					return off, errInvalidName
+				}
+			}
+
 			name = append(name, msg[currOff:endOff]...)
 			name = append(name, '.')
 			currOff = endOff

dns/dnsmessage/message_test.go

@@ -211,6 +211,15 @@ func TestName(t *testing.T) {
 	}
 }
 
+func TestNameWithDotsUnpack(t *testing.T) {
+	name := []byte{3, 'w', '.', 'w', 2, 'g', 'o', 3, 'd', 'e', 'v', 0}
+	var n Name
+	_, err := n.unpack(name, 0)
+	if err != errInvalidName {
+		t.Fatalf("expected %v, got %v", errInvalidName, err)
+	}
+}
+
 func TestNamePackUnpack(t *testing.T) {
 	const suffix = ".go.dev."
 	var longDNSPrefix = strings.Repeat("verylongdomainlabel.", 20)