Skip to content

Validate the DXBC shader length against the container part size #8782

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
Nilesh Patil (nileshpatil6) wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −2
Open

Validate the DXBC shader length against the container part size #8782

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
17 changes: 15 additions & 2 deletions projects/dxilconv/lib/DxbcConverter/DxbcConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,23 @@ void DxbcConverter::ConvertImpl(LPCVOID pDxbc, UINT32 DxbcSize,
IFTBOOL(uCodeBlob != DXIL_CONTAINER_BLOB_NOT_FOUND, DXC_E_INCORRECT_DXBC);

const CShaderToken *pByteCode;
IFTBOOL(dxbcReader.GetPartContent(uCodeBlob, (const void **)&pByteCode) ==
S_OK,
UINT32 ByteCodePartSize = 0;
IFTBOOL(dxbcReader.GetPartContent(uCodeBlob, (const void **)&pByteCode,
&ByteCodePartSize) == S_OK,
DXC_E_INCORRECT_DXBC);

// The shader declares its own length in tokens at pByteCode[1], and the
// parser derives its end pointer from it. The container reader has bounded
// the part itself, but not that declared length, so a malformed part could
// point the parser past the end of the container. Check that the version and
// length tokens are present and that the declared length stays inside the
// part before handing the buffer to the parser.
IFTBOOL(ByteCodePartSize >= 2 * sizeof(CShaderToken),
DXC_E_ERROR_PARSING_DXBC_BYTECODE);
IFTBOOL(pByteCode[1] >= 2 &&
pByteCode[1] <= ByteCodePartSize / sizeof(CShaderToken),
DXC_E_ERROR_PARSING_DXBC_BYTECODE);

// Parse DXBC container.
D3D10ShaderBinary::CShaderCodeParser Parser;

Expand Down
Loading