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

Fix out of bounds read #507

Merged
merged 7 commits into from
Jul 31, 2023
Merged

Fix out of bounds read #507

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6400dfc
header size check
Boneyan Jul 6, 2023
5cb4027
Update go.mod
Boneyan Jul 6, 2023
9a7bd94
no continue
Boneyan Jul 17, 2023
5bd60b5
revert go.mod
Boneyan Jul 17, 2023
62a3d49
Merge branch 'master' into fix-out-of-bounds-read
pmazzini Jul 20, 2023
5d50c4b
isValid() method
Boneyan Jul 27, 2023
5771e16
stylistic changes
Boneyan Jul 31, 2023
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
11 changes: 7 additions & 4 deletions dhcpv4/nclient4/conn_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,18 @@
}

ipHdr := ipv4(buf.Data())
headerLength := ipHdr.headerLength()

if !buf.Has(int(ipHdr.headerLength())) {
if !buf.Has(int(headerLength)) {
continue
}

ipHdr = ipv4(buf.Consume(int(ipHdr.headerLength())))
ipHdr = ipv4(buf.Consume(int(headerLength)))

if ipHdr.transportProtocol() != udpProtocolNumber {
continue
if headerLength > protocol {
if ipHdr.transportProtocol() != udpProtocolNumber {
continue

Check warning on line 118 in dhcpv4/nclient4/conn_unix.go

View check run for this annotation

Codecov / codecov/patch

dhcpv4/nclient4/conn_unix.go#L118 

Added line #L118 was not covered by tests
}
}

if !buf.Has(udpHdrLen) {
pmazzini marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading