wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Validate DXBC checksums.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2020-07-23 13:41:27 +04:30 committed by Alexandre Julliard
parent 1f6ce3ceba
commit 9fcf00e2bf
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/vkd3d-shader/dxbc.c
View File

@ -1944,6 +1944,7 @@ static const char *shader_get_string(const char *data, size_t data_size, DWORD o
static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_message_context *message_context, static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_message_context *message_context,
int (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) int (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx)
{ {
uint32_t checksum[4], calculated_checksum[4];
const char *ptr = data; const char *ptr = data;
int ret = VKD3D_OK; int ret = VKD3D_OK;
DWORD chunk_count; DWORD chunk_count;
@ -1970,8 +1971,21 @@ static int parse_dxbc(const char *data, size_t data_size, struct vkd3d_shader_me
return VKD3D_ERROR_INVALID_ARGUMENT; return VKD3D_ERROR_INVALID_ARGUMENT;
} }
WARN("Ignoring DXBC checksum.\n"); read_dword(&ptr, &checksum[0]);
skip_dword_unknown(&ptr, 4); read_dword(&ptr, &checksum[1]);
read_dword(&ptr, &checksum[2]);
read_dword(&ptr, &checksum[3]);
vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum);
if (memcmp(checksum, calculated_checksum, sizeof(checksum)))
{
WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match "
"calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n",
checksum[0], checksum[1], checksum[2], checksum[3],
calculated_checksum[0], calculated_checksum[1],
calculated_checksum[2], calculated_checksum[3]);
vkd3d_shader_error(message_context, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, "Invalid DXBC checksum.");
return VKD3D_ERROR_INVALID_ARGUMENT;
}
read_dword(&ptr, &version); read_dword(&ptr, &version);
TRACE("version: %#x.\n", version); TRACE("version: %#x.\n", version);

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -63,6 +63,7 @@ enum vkd3d_shader_error
{ {
VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1,
VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2, VKD3D_SHADER_ERROR_DXBC_INVALID_MAGIC = 2,
VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM = 3,
}; };
enum VKD3D_SHADER_INSTRUCTION_HANDLER enum VKD3D_SHADER_INSTRUCTION_HANDLER