Skip to content

Fix bounds check in CacheVC::scanObject #13263

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

Open
traeak wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −3
Open

Fix bounds check in CacheVC::scanObject #13263

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
14 changes: 11 additions & 3 deletions src/iocore/cache/CacheVC.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,9 +766,17 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
break;
}
if (doc->data() - buf->data() > static_cast<int>(io.aiocb.aio_nbytes)) {
might_need_overlap_read = true;
goto Lskip;
{
size_t const doc_off = reinterpret_cast<char *>(doc) - buf->data();
// Bounds-check in unsigned domain: doc must lie within the
// buffer, with room for the Doc header, and doc->hlen must
// fit in the remaining bytes before doc->hdr() and
// HTTPInfo::unmarshal walk it.
if (io.aiocb.aio_nbytes < doc_off || (io.aiocb.aio_nbytes - doc_off) < sizeof(Doc) ||
(io.aiocb.aio_nbytes - doc_off - sizeof(Doc)) < doc->hlen) {
might_need_overlap_read = true;
goto Lskip;
}
}
{
char *tmp = doc->hdr();
Expand Down