Skip to content

Commit 4b10404

Browse files
neildgopherbot
authored andcommitted
ipv4, ipv6: avoid nil parse function call in ControlMessage.Parse
Check that ctlOpts entries are populated (name > 0) before matching against the control message type in ControlMessage.Parse. Previously, a control message with type 0 could match an unpopulated ctlOpts entry and panic calling a nil parse function. Change-Id: I9f4b2b419ada6ad76f4a294716dc8ad06a6a6964 Reviewed-on: https://go-review.googlesource.com/c/net/+/852825 LUCI-TryBot-Result: [email protected] <[email protected]> Reviewed-by: David Chase <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Auto-Submit: Damien Neil <[email protected]>
1 parent afcf8cd commit 4b10404

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

‎ipv4/control.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ func (cm *ControlMessage) Parse(b []byte) error {
8484
continue
8585
}
8686
switch {
87-
case typ == ctlOpts[ctlTTL].name && l >= ctlOpts[ctlTTL].length:
87+
case ctlOpts[ctlTTL].name > 0 && typ == ctlOpts[ctlTTL].name && l >= ctlOpts[ctlTTL].length:
8888
ctlOpts[ctlTTL].parse(cm, m.Data(l))
89-
case typ == ctlOpts[ctlDst].name && l >= ctlOpts[ctlDst].length:
89+
case ctlOpts[ctlDst].name > 0 && typ == ctlOpts[ctlDst].name && l >= ctlOpts[ctlDst].length:
9090
ctlOpts[ctlDst].parse(cm, m.Data(l))
91-
case typ == ctlOpts[ctlInterface].name && l >= ctlOpts[ctlInterface].length:
91+
case ctlOpts[ctlInterface].name > 0 && typ == ctlOpts[ctlInterface].name && l >= ctlOpts[ctlInterface].length:
9292
ctlOpts[ctlInterface].parse(cm, m.Data(l))
93-
case typ == ctlOpts[ctlPacketInfo].name && l >= ctlOpts[ctlPacketInfo].length:
93+
case ctlOpts[ctlPacketInfo].name > 0 && typ == ctlOpts[ctlPacketInfo].name && l >= ctlOpts[ctlPacketInfo].length:
9494
ctlOpts[ctlPacketInfo].parse(cm, m.Data(l))
9595
}
9696
}

‎ipv4/control_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
func TestControlMessageParseWithFuzz(t *testing.T) {
1414
var cm ipv4.ControlMessage
1515
for _, fuzz := range []string{
16+
"\f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
17+
"\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
1618
"\f\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00",
1719
"\f\x00\x00\x00\x00\x00\x00\x00\x1a\x00\x00\x00",
1820
} {

‎ipv6/control.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ func (cm *ControlMessage) Parse(b []byte) error {
130130
continue
131131
}
132132
switch {
133-
case typ == ctlOpts[ctlTrafficClass].name && l >= ctlOpts[ctlTrafficClass].length:
133+
case ctlOpts[ctlTrafficClass].name > 0 && typ == ctlOpts[ctlTrafficClass].name && l >= ctlOpts[ctlTrafficClass].length:
134134
ctlOpts[ctlTrafficClass].parse(cm, m.Data(l))
135-
case typ == ctlOpts[ctlHopLimit].name && l >= ctlOpts[ctlHopLimit].length:
135+
case ctlOpts[ctlHopLimit].name > 0 && typ == ctlOpts[ctlHopLimit].name && l >= ctlOpts[ctlHopLimit].length:
136136
ctlOpts[ctlHopLimit].parse(cm, m.Data(l))
137-
case typ == ctlOpts[ctlPacketInfo].name && l >= ctlOpts[ctlPacketInfo].length:
137+
case ctlOpts[ctlPacketInfo].name > 0 && typ == ctlOpts[ctlPacketInfo].name && l >= ctlOpts[ctlPacketInfo].length:
138138
ctlOpts[ctlPacketInfo].parse(cm, m.Data(l))
139-
case typ == ctlOpts[ctlPathMTU].name && l >= ctlOpts[ctlPathMTU].length:
139+
case ctlOpts[ctlPathMTU].name > 0 && typ == ctlOpts[ctlPathMTU].name && l >= ctlOpts[ctlPathMTU].length:
140140
ctlOpts[ctlPathMTU].parse(cm, m.Data(l))
141141
}
142142
}

‎ipv6/control_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import (
1313
func TestControlMessageParseWithFuzz(t *testing.T) {
1414
var cm ipv6.ControlMessage
1515
for _, fuzz := range []string{
16+
"\f\x00\x00\x00)\x00\x00\x00\x00\x00\x00\x00",
17+
"\x10\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00\x00\x00\x00\x00",
1618
"\f\x00\x00\x00)\x00\x00\x00.\x00\x00\x00",
1719
"\f\x00\x00\x00)\x00\x00\x00,\x00\x00\x00",
1820
} {

0 commit comments

Comments
 (0)