Skip to content

Commit 9425eb3

Browse files
neildgopherbot
authored andcommitted
internal/socket, ipv4, ipv6: avoid panic on empty control message on non-Unix
On platforms without cmsghdr support (such as Windows), controlHeaderLen returns 0. Guard against controlHeaderLen() <= 0 in ControlMessage methods so parsing or marshaling an empty buffer does not index &m[0] and panic. Change-Id: I16f8bc821b92a015af4ef9711e7378206a6a6964 Reviewed-on: https://go-review.googlesource.com/c/net/+/852826 LUCI-TryBot-Result: [email protected] <[email protected]> Auto-Submit: Damien Neil <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]> Reviewed-by: David Chase <[email protected]>
1 parent 4b10404 commit 9425eb3

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

‎internal/socket/socket.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ func (m ControlMessage) Next(dataLen int) ControlMessage {
129129
// MarshalHeader marshals the header fields of the control message at
130130
// the head on m.
131131
func (m ControlMessage) MarshalHeader(lvl, typ, dataLen int) error {
132-
if len(m) < controlHeaderLen() {
132+
l := controlHeaderLen()
133+
if l <= 0 || len(m) < l {
133134
return errors.New("short message")
134135
}
135136
h := (*cmsghdr)(unsafe.Pointer(&m[0]))
@@ -141,7 +142,7 @@ func (m ControlMessage) MarshalHeader(lvl, typ, dataLen int) error {
141142
// message at the head on m.
142143
func (m ControlMessage) ParseHeader() (lvl, typ, dataLen int, err error) {
143144
l := controlHeaderLen()
144-
if len(m) < l {
145+
if l <= 0 || len(m) < l {
145146
return 0, 0, 0, errors.New("short message")
146147
}
147148
h := (*cmsghdr)(unsafe.Pointer(&m[0]))
@@ -152,7 +153,7 @@ func (m ControlMessage) ParseHeader() (lvl, typ, dataLen int, err error) {
152153
// the next control message.
153154
func (m ControlMessage) Marshal(lvl, typ int, data []byte) (ControlMessage, error) {
154155
l := len(data)
155-
if len(m) < ControlMessageSpace(l) {
156+
if controlHeaderLen() <= 0 || len(m) < ControlMessageSpace(l) {
156157
return nil, errors.New("short message")
157158
}
158159
h := (*cmsghdr)(unsafe.Pointer(&m[0]))
@@ -167,6 +168,9 @@ func (m ControlMessage) Marshal(lvl, typ int, data []byte) (ControlMessage, erro
167168
//
168169
// Parse works for both standard and compatible messages.
169170
func (m ControlMessage) Parse() ([]ControlMessage, error) {
171+
if controlHeaderLen() <= 0 {
172+
return nil, nil
173+
}
170174
var ms []ControlMessage
171175
for len(m) >= controlHeaderLen() {
172176
h := (*cmsghdr)(unsafe.Pointer(&m[0]))

‎ipv4/control_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
func TestControlMessageParseWithFuzz(t *testing.T) {
1414
var cm ipv4.ControlMessage
1515
for _, fuzz := range []string{
16+
"",
1617
"\f\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
1718
"\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
1819
"\f\x00\x00\x00\x00\x00\x00\x00\x14\x00\x00\x00",

‎ipv6/control_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
func TestControlMessageParseWithFuzz(t *testing.T) {
1414
var cm ipv6.ControlMessage
1515
for _, fuzz := range []string{
16+
"",
1617
"\f\x00\x00\x00)\x00\x00\x00\x00\x00\x00\x00",
1718
"\x10\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00\x00\x00\x00\x00",
1819
"\f\x00\x00\x00)\x00\x00\x00.\x00\x00\x00",

0 commit comments

Comments
 (0)