samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: sde: prevent illegal register access"

Browse Source
This commit is contained in:
qctecmdr
2020-10-28 18:43:29 -07:00
committed by Gerrit - the friendly Code Review server
parent 2fb129f394 a0ae165cc3
commit c7ba46d5bf
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
msm/sde/sde_kms.c
View File

@@ -4585,6 +4585,7 @@ static int _sde_kms_register_events(struct msm_kms *kms,
struct drm_crtc *crtc = NULL; struct drm_crtc *crtc = NULL;
struct drm_connector *conn = NULL; struct drm_connector *conn = NULL;
struct sde_kms *sde_kms = NULL; struct sde_kms *sde_kms = NULL;
struct sde_vm_ops *vm_ops;
if (!kms || !obj) { if (!kms || !obj) {
SDE_ERROR("invalid argument kms %pK obj %pK\n", kms, obj); SDE_ERROR("invalid argument kms %pK obj %pK\n", kms, obj);
@@ -4592,6 +4593,14 @@ static int _sde_kms_register_events(struct msm_kms *kms,
} }
sde_kms = to_sde_kms(kms); sde_kms = to_sde_kms(kms);
vm_ops = sde_vm_get_ops(sde_kms);
sde_vm_lock(sde_kms);
if (vm_ops && vm_ops->vm_owns_hw && !vm_ops->vm_owns_hw(sde_kms)) {
sde_vm_unlock(sde_kms);
DRM_INFO("HW is owned by other VM\n");
return -EACCES;
}
switch (obj->type) { switch (obj->type) {
case DRM_MODE_OBJECT_CRTC: case DRM_MODE_OBJECT_CRTC:
crtc = obj_to_crtc(obj); crtc = obj_to_crtc(obj);
@@ -4604,6 +4613,7 @@ static int _sde_kms_register_events(struct msm_kms *kms,
break; break;
} }
sde_vm_unlock(sde_kms);
return ret; return ret;
} }