summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/frontends/va/picture.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index eca03725d65..25d64831bf4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -211,7 +211,7 @@
"description": "frontends/va: fix protected slice data buffer read size",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "deb7dc82f626e92525d01829d88f0ac348de03b8"
},
diff --git a/src/gallium/frontends/va/picture.c b/src/gallium/frontends/va/picture.c
index bcfb79e75f2..0b65e2687a2 100644
--- a/src/gallium/frontends/va/picture.c
+++ b/src/gallium/frontends/va/picture.c
@@ -263,7 +263,7 @@ handleVAProtectedSliceDataBufferType(vlVaContext *context, vlVaBuffer *buf)
{
uint8_t* encrypted_data = (uint8_t*) buf->data;
- unsigned int drm_key_size = 56 * 4;
+ unsigned int drm_key_size = buf->size;
context->desc.base.decrypt_key = CALLOC(1, drm_key_size);
memcpy(context->desc.base.decrypt_key, encrypted_data, drm_key_size);