OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Compute hashes in secure process for secure compilation.

Browse Source 
To prevent poisoning arbitrary cache entries.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Bas Nieuwenhuizen
2019-10-30 02:54:37 +01:00
parent 4c4ac2d4d5
commit d78809632f
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/amd/vulkan/radv_pipeline.c
View File

@@ -4629,6 +4629,21 @@ radv_secure_compile(struct radv_pipeline *pipeline,
const VkPipelineCreateFlags flags,
unsigned num_stages)
{
uint8_t allowed_pipeline_hashes[2][20];
radv_hash_shaders(allowed_pipeline_hashes[0], pStages,
pipeline->layout, key, get_hash_flags(device));
/* Generate the GC copy hash */
memcpy(allowed_pipeline_hashes[1], allowed_pipeline_hashes[0], 20);
allowed_pipeline_hashes[1][0] ^= 1;
uint8_t allowed_hashes[2][20];
for (unsigned i = 0; i < 2; ++i) {
disk_cache_compute_key(device->physical_device->disk_cache,
allowed_pipeline_hashes[i], 20,
allowed_hashes[i]);
}
unsigned process = 0;
uint8_t sc_threads = device->instance->num_sc_threads;
while (true) {
@@ -4718,6 +4733,10 @@ radv_secure_compile(struct radv_pipeline *pipeline,
if (!radv_sc_read(fd_secure_output, disk_sha1, sizeof(uint8_t) * 20, true))
return VK_ERROR_DEVICE_LOST;
if (memcmp(disk_sha1, allowed_hashes[0], 20) &&
memcmp(disk_sha1, allowed_hashes[1], 20))
return VK_ERROR_DEVICE_LOST;
uint32_t entry_size;
if (!radv_sc_read(fd_secure_output, &entry_size, sizeof(uint32_t), true))
return VK_ERROR_DEVICE_LOST;
@@ -4736,6 +4755,10 @@ radv_secure_compile(struct radv_pipeline *pipeline,
if (!radv_sc_read(fd_secure_output, disk_sha1, sizeof(uint8_t) * 20, true))
return VK_ERROR_DEVICE_LOST;
if (memcmp(disk_sha1, allowed_hashes[0], 20) &&
memcmp(disk_sha1, allowed_hashes[1], 20))
return VK_ERROR_DEVICE_LOST;
size_t size;
struct cache_entry *entry = (struct cache_entry *)
disk_cache_get(device->physical_device->disk_cache,