Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mpegts: fix panic with specially-crafted strings; add fuzzing #29

Merged
merged 1 commit into from
Jul 30, 2023
Merged

mpegts: fix panic with specially-crafted strings; add fuzzing #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/bluenviron/mediacommon
go 1.18

require (
github.com/asticode/go-astits v1.11.0
github.com/asticode/go-astits v1.11.1-0.20230727094110-0df190a2dd87
github.com/stretchr/testify v1.8.4
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflxkRsZA=
github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
github.com/asticode/go-astits v1.11.0 h1:GTHUXht0ZXAJXsVbsLIcyfHr1Bchi4QQwMARw2ZWAng=
github.com/asticode/go-astits v1.11.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
github.com/asticode/go-astits v1.11.1-0.20230727094110-0df190a2dd87 h1:SCAqalLhgKGDghGz03yYVWr8TavHluP/i7IwshKU9yA=
github.com/asticode/go-astits v1.11.1-0.20230727094110-0df190a2dd87/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
107 changes: 103 additions & 4 deletions pkg/formats/mpegts/reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestReader(t *testing.T) {

// PMT
_, err := mux.WritePacket(&astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
Expand All @@ -33,7 +33,7 @@ func TestReader(t *testing.T) {

// PAT
_, err = mux.WritePacket(&astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
Expand All @@ -54,7 +54,7 @@ func TestReader(t *testing.T) {
StuffingLength: 129,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand All @@ -81,7 +81,7 @@ func TestReader(t *testing.T) {
StuffingLength: 157,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand Down Expand Up @@ -143,3 +143,102 @@ func TestReader(t *testing.T) {
}
})
}

func FuzzReader(f *testing.F) {
f.Add(true, []byte{
0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x80,
0x05, 0x21, 0x00, 0x0b, 0x7e, 0x41, 0x00, 0x00,
0x00, 0x01,
0x67, 0x42, 0xc0, 0x28, 0xd9, 0x00, 0x78, 0x02,
0x27, 0xe5, 0x84, 0x00, 0x00, 0x03, 0x00, 0x04,
0x00, 0x00, 0x03, 0x00, 0xf0, 0x3c, 0x60, 0xc9,
0x20,
0x00, 0x00, 0x00, 0x01, 0x08,
0x00, 0x00, 0x00, 0x01, 0x05,
})

f.Fuzz(func(t *testing.T, pid bool, b []byte) {
var buf bytes.Buffer
mux := astits.NewMuxer(context.Background(), &buf)

// PMT
mux.WritePacket(&astits.Packet{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
},
Payload: append([]byte{
0x00, 0x00, 0xb0, 0x0d, 0x00, 0x00, 0xc1, 0x00,
0x00, 0x00, 0x01, 0xf0, 0x00, 0x71, 0x10, 0xd8,
0x78,
}, bytes.Repeat([]byte{0xff}, 167)...),
})

// PAT
mux.WritePacket(&astits.Packet{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
},
Payload: append([]byte{
0x00, 0x02, 0xb0, 0x17, 0x00, 0x01, 0xc1, 0x00,
0x00, 0xe1, 0x00, 0xf0, 0x00, 0x1b, 0xe1, 0x00,
0xf0, 0x00, 0x0f, 0xe1, 0x01, 0xf0, 0x00, 0x2f,
0x44, 0xb9, 0x9b,
}, bytes.Repeat([]byte{0xff}, 157)...),
})

// AAC config
mux.WritePacket(&astits.Packet{
AdaptationField: &astits.PacketAdaptationField{
Length: 158,
StuffingLength: 157,
RandomAccessIndicator: true,
},
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 257,
},
Payload: []byte{
0x00, 0x00, 0x01, 0xc0, 0x00, 0x13, 0x80, 0x80,
0x05, 0x21, 0x00, 0x11, 0x3d, 0x61, 0xff, 0xf1,
0x50, 0x80, 0x01, 0x7f, 0xfc, 0x01, 0x02, 0x03,
0x04,
},
})

r, err := NewReader(&buf)
if err != nil {
panic(err)
}

// PES
mux.WritePacket(&astits.Packet{
AdaptationField: &astits.PacketAdaptationField{
Length: 130,
StuffingLength: 129,
RandomAccessIndicator: true,
},
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: func() uint16 {
if pid {
return 256
}
return 257
}(),
},
Payload: b,
})

r.Read()
r.Read()
r.Read()
})
}
3 changes: 3 additions & 0 deletions pkg/formats/mpegts/testdata/fuzz/FuzzReader/5a37383f84ff4d3a
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
go test fuzz v1
bool(true)
[]byte("00000000000000000000000000000000000000000000000000")
3 changes: 3 additions & 0 deletions pkg/formats/mpegts/testdata/fuzz/FuzzReader/9136540beb330fb2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
go test fuzz v1
bool(true)
[]byte("\x00\x00\x010\x00 000")
3 changes: 3 additions & 0 deletions pkg/formats/mpegts/testdata/fuzz/FuzzReader/916aafb26a91fa4d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
go test fuzz v1
bool(false)
[]byte("")
3 changes: 3 additions & 0 deletions pkg/formats/mpegts/testdata/fuzz/FuzzReader/e48c5afcad56469e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
go test fuzz v1
bool(true)
[]byte("\x00\x00\x010\x00+00 0")
32 changes: 16 additions & 16 deletions pkg/formats/mpegts/writer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestWriter(t *testing.T) {
pkt, err := dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
Expand All @@ -148,7 +148,7 @@ func TestWriter(t *testing.T) {
pkt, err = dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
Expand All @@ -170,7 +170,7 @@ func TestWriter(t *testing.T) {
StuffingLength: 129,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand All @@ -197,7 +197,7 @@ func TestWriter(t *testing.T) {
StuffingLength: 157,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand Down Expand Up @@ -237,7 +237,7 @@ func TestWriter(t *testing.T) {
pkt, err := dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
Expand All @@ -253,7 +253,7 @@ func TestWriter(t *testing.T) {
pkt, err = dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
Expand All @@ -274,7 +274,7 @@ func TestWriter(t *testing.T) {
StuffingLength: 129,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand Down Expand Up @@ -316,7 +316,7 @@ func TestWriter(t *testing.T) {
pkt, err := dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
Expand All @@ -332,7 +332,7 @@ func TestWriter(t *testing.T) {
pkt, err = dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
Expand All @@ -353,7 +353,7 @@ func TestWriter(t *testing.T) {
StuffingLength: 157,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand Down Expand Up @@ -397,7 +397,7 @@ func TestWriter(t *testing.T) {
pkt, err := dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
Expand Down Expand Up @@ -433,7 +433,7 @@ func TestWriter(t *testing.T) {
pkt, err = dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
Expand Down Expand Up @@ -474,7 +474,7 @@ func TestWriter(t *testing.T) {
StuffingLength: 160,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand All @@ -491,7 +491,7 @@ func TestWriter(t *testing.T) {
pkt, err = dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 0,
Expand Down Expand Up @@ -528,7 +528,7 @@ func TestWriter(t *testing.T) {
pkt, err = dem.NextPacket()
require.NoError(t, err)
require.Equal(t, &astits.Packet{
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasPayload: true,
PayloadUnitStartIndicator: true,
PID: 4096,
Expand Down Expand Up @@ -570,7 +570,7 @@ func TestWriter(t *testing.T) {
StuffingLength: 164,
RandomAccessIndicator: true,
},
Header: &astits.PacketHeader{
Header: astits.PacketHeader{
HasAdaptationField: true,
HasPayload: true,
PayloadUnitStartIndicator: true,
Expand Down