drm/radeon: avoid kernel segfault in vce when gpu fails to resume
Subsystems (2)
PATCH 1/1 drm/radeon: avoid kernel segfault in vce when gpu fails to resume
From: Jérôme Glisse <[email protected]>
When GPU fails to resume we can not trust that value we write to GPU memory will post and we might get garbage (more like 0xffffffff on x86) when reading them back. This trigger out of range memory access in the kernel inside the vce resume code path.
This patch use canonical value to compute offset instead of reading back value from GPU memory.
--- drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/vce_v1_0.c +1 -1
@@ -196,7 +196,7 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data)memset (&data[5 ],0 ,44 );memcpy (&data[16 ], &sign[1 ], rdev->vce_fw->size -sizeof (*sign)); - data +=le32_to_cpu (data[4 ]) /4 ; + data += (le32_to_cpu (sign->len) +64 ) /4 ; data[0 ] = sign->val[i].sigval[0 ]; data[1 ] = sign->val[i].sigval[1 ]; data[2 ] = sign->val[i].sigval[2 ];
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 06.02.2017 um 21:13 schrieb [email protected]:
Quoted 11 lines
From: Jérôme Glisse <[email protected]>
When GPU fails to resume we can not trust that value we write to GPU memory will post and we might get garbage (more like
0xffffffffon x86) when reading them back. This trigger out of range memory access in the kernel inside the vce resume code path.This patch use canonical value to compute offset instead of reading back value from GPU memory.
Signed-off-by Jérôme Glisse <[email protected]>
Good point, path is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.
Quoted 9 lines
--- drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/radeon/vce_v1_0.c +0
-0
drivers/gpu/drm/radeon/vce_v1_0.c int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data) · line 202
Quoted 8 lines
drivers/gpu/drm/radeon/vce_v1_0.c +1
-1@@ -196,7 +196,7 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data)memset (&data[5 ],0 ,44 );memcpy (&data[16 ], &sign[1 ], rdev->vce_fw->size -sizeof (*sign)); - data +=le32_to_cpu (data[4 ]) /4 ; + data += (le32_to_cpu (sign->len) +64 ) /4 ; data[0 ] = sign->val[i].sigval[0 ]; data[1 ] = sign->val[i].sigval[1 ]; data[2 ] = sign->val[i].sigval[2 ];
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Alex Deucher
AppliedQuoted 13 lines · Christian König
Am 06.02.2017 um 21:13 schrieb [email protected]:
Quoted 12 lines
From: Jérôme Glisse <[email protected]>
When GPU fails to resume we can not trust that value we write to GPU memory will post and we might get garbage (more like
0xffffffffon x86) when reading them back. This trigger out of range memory access in the kernel inside the vce resume code path.This patch use canonical value to compute offset instead of reading back value from GPU memory.
Signed-off-by Jérôme Glisse <[email protected]>
Applied. Thanks!
Alex
Quoted 24 lines
Good point, path is Reviewed-by: Christian König <[email protected]>.
Regards,
Christian.Quoted 17 lines
--- drivers/gpu/drm/radeon/vce_v1_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/radeon/vce_v1_0.c +1
-0@@ -196,7 +196,7 @@ int vce_v1_0_load_fw(struct radeon_device *rdev, uint32_t *data) memset(&data[5], 0, 44);memcpy (&data[16 ], &sign[1 ], rdev->vce_fw->size -sizeof (*sign)); - data +=le32_to_cpu (data[4 ]) /4 ; + data += (le32_to_cpu (sign->len) +64 ) /4 ; data[0 ] = sign->val[i].sigval[0 ]; data[1 ] = sign->val[i].sigval[1 ];
Quoted 8 lines
Quoted 1 line
data[2] = sign->val[i].sigval[2];_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel