Skip to content

Commit afcf8cd

Browse files
neildgopherbot
authored andcommitted
ipv4: fix several missing bounds checks
Change-Id: Ib22edd9e8f5755a788944895a1c7d3ec6a6a6964 Reviewed-on: https://go-review.googlesource.com/c/net/+/852745 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 4af4fce commit afcf8cd

5 files changed

Lines changed: 91 additions & 3 deletions

File tree

‎ipv4/header.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ func (h *Header) Parse(b []byte) error {
111111
return errHeaderTooShort
112112
}
113113
hdrlen := int(b[0]&0x0f) << 2
114+
if hdrlen < HeaderLen {
115+
return errHeaderTooShort
116+
}
114117
if len(b) < hdrlen {
115118
return errExtHeaderTooShort
116119
}

‎ipv4/header_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ func TestParseHeader(t *testing.T) {
207207
{nil, nil, errNilHeader},
208208
{&Header{}, nil, errNilHeader},
209209
{&Header{}, make([]byte, HeaderLen-1), errHeaderTooShort},
210+
{&Header{}, make([]byte, HeaderLen), errHeaderTooShort},
210211
{&Header{}, []byte{
211212
0x46, 0x00, 0x00, 0x00,
212213
0x00, 0x00, 0x00, 0x00,

‎ipv4/packet.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ func slicePacket(b []byte) (h, p []byte, err error) {
6565
return nil, nil, errHeaderTooShort
6666
}
6767
hdrlen := int(b[0]&0x0f) << 2
68+
if hdrlen < HeaderLen {
69+
return nil, nil, errHeaderTooShort
70+
}
71+
if len(b) < hdrlen {
72+
return nil, nil, errExtHeaderTooShort
73+
}
6874
return b[:hdrlen], b[hdrlen:], nil
6975
}
7076

‎ipv4/payload_cmsg.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.
3838
return 0, nil, nil, &net.OpError{Op: "read", Net: c.PacketConn.LocalAddr().Network(), Source: c.PacketConn.LocalAddr(), Err: err}
3939
}
4040
hdrlen := int(h[0]&0x0f) << 2
41+
if m.N < HeaderLen || hdrlen < HeaderLen {
42+
return 0, nil, nil, &net.OpError{Op: "read", Net: c.PacketConn.LocalAddr().Network(), Source: c.PacketConn.LocalAddr(), Err: errHeaderTooShort}
43+
}
44+
if m.N < hdrlen {
45+
return 0, nil, nil, &net.OpError{Op: "read", Net: c.PacketConn.LocalAddr().Network(), Source: c.PacketConn.LocalAddr(), Err: errExtHeaderTooShort}
46+
}
4147
if hdrlen > len(h) {
4248
d := hdrlen - len(h)
4349
copy(b, b[d:])
44-
m.N -= d
45-
} else {
46-
m.N -= hdrlen
4750
}
51+
m.N -= hdrlen
4852
default:
4953
return 0, nil, nil, &net.OpError{Op: "read", Net: c.PacketConn.LocalAddr().Network(), Source: c.PacketConn.LocalAddr(), Err: errInvalidConnType}
5054
}

‎ipv4/unicast_test.go‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,3 +236,77 @@ func TestRawConnReadWriteUnicastICMP(t *testing.T) {
236236
}
237237
}
238238
}
239+
240+
func TestReadWriteUnicastIPOptions(t *testing.T) {
241+
switch runtime.GOOS {
242+
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
243+
t.Skipf("not supported on %s", runtime.GOOS)
244+
}
245+
if !nettest.SupportsRawSocket() {
246+
t.Skipf("not supported on %s/%s", runtime.GOOS, runtime.GOARCH)
247+
}
248+
if _, err := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback); err != nil {
249+
t.Skipf("not available on %s", runtime.GOOS)
250+
}
251+
252+
c, err := net.ListenPacket("ip4:253", "127.0.0.1")
253+
if err != nil {
254+
t.Fatal(err)
255+
}
256+
defer c.Close()
257+
258+
r, err := ipv4.NewRawConn(c)
259+
if err != nil {
260+
t.Fatal(err)
261+
}
262+
p := ipv4.NewPacketConn(c)
263+
264+
wb := []byte("HELLO-R-U-THERE")
265+
opts := []byte{1, 1, 1, 1}
266+
wh := &ipv4.Header{
267+
Version: ipv4.Version,
268+
Len: ipv4.HeaderLen + len(opts),
269+
TotalLen: ipv4.HeaderLen + len(opts) + len(wb),
270+
TTL: 1,
271+
Protocol: 253,
272+
Dst: net.IPv4(127, 0, 0, 1),
273+
Options: opts,
274+
}
275+
276+
// RawConn.ReadFrom with a buffer large enough for header, options, and payload.
277+
if err := r.WriteTo(wh, wb, nil); err != nil {
278+
t.Fatal(err)
279+
}
280+
rb := make([]byte, 128)
281+
if rh, b, _, err := r.ReadFrom(rb); err != nil {
282+
t.Fatal(err)
283+
} else if !bytes.Equal(rh.Options, opts) || !bytes.Equal(b, wb) {
284+
t.Fatalf("got options=%v, payload=%v; want options=%v, payload=%v", rh.Options, b, opts, wb)
285+
}
286+
287+
// RawConn.ReadFrom with a buffer shorter than header + options.
288+
if err := r.WriteTo(wh, wb, nil); err != nil {
289+
t.Fatal(err)
290+
}
291+
if _, _, _, err := r.ReadFrom(make([]byte, ipv4.HeaderLen)); err == nil {
292+
t.Fatal("got nil; want error")
293+
}
294+
295+
// PacketConn.ReadFrom with a buffer large enough for options and payload.
296+
if err := r.WriteTo(wh, wb, nil); err != nil {
297+
t.Fatal(err)
298+
}
299+
if n, _, _, err := p.ReadFrom(rb); err != nil {
300+
t.Fatal(err)
301+
} else if !bytes.Equal(rb[:n], wb) {
302+
t.Fatalf("got %v; want %v", rb[:n], wb)
303+
}
304+
305+
// PacketConn.ReadFrom with a buffer shorter than options.
306+
if err := r.WriteTo(wh, wb, nil); err != nil {
307+
t.Fatal(err)
308+
}
309+
if _, _, _, err := p.ReadFrom(make([]byte, len(opts)-1)); err == nil {
310+
t.Fatal("got nil; want error")
311+
}
312+
}

0 commit comments

Comments
 (0)