samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

disp: msm: sde: avoid null pointer dereference

Telusuri Sumber 
This change avoids null pointer dereference in different APIs.

Change-Id: I01eba9d64fa4ba2fd81f7f39f586867e22d66771
Signed-off-by: Narendra Muppalla <quic_nmuppall@quicinc.com>
This commit is contained in:
Narendra Muppalla
2022-02-11 15:59:01 -08:00
orang tua 231eb36b84
melakukan ae96cad06c
6 mengubah file dengan 117 tambahan dan 48 penghapusan
Download Patch File Download Diff File Expand all files Collapse all files

46
msm/sde/sde_plane.c
Melihat File

@@ -2709,27 +2709,12 @@ modeset_update:
return ret;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
static int sde_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *atomic_state)
#else
static int sde_plane_atomic_check(struct drm_plane *plane,
static int _sde_plane_atomic_check(struct drm_plane *plane,
struct drm_plane_state *state)
#endif
{
int ret = 0;
struct sde_plane *psde;
struct sde_plane_state *pstate;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
struct drm_plane_state *state = drm_atomic_get_new_plane_state(atomic_state, plane);
#endif
if (!plane || !state) {
SDE_ERROR("invalid arg(s), plane %d state %d\n",
!plane, !state);
ret = -EINVAL;
goto exit;
}
psde = to_sde_plane(plane);
pstate = to_sde_plane_state(state);
@@ -2746,6 +2731,35 @@ exit:
return ret;
}
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
static int sde_plane_atomic_check(struct drm_plane *plane,
struct drm_atomic_state *atomic_state)
{
struct drm_plane_state *state = NULL;
if (!plane || !atomic_state) {
SDE_ERROR("invalid arg(s), plane %d atomic_state %d\n",
!plane, !atomic_state);
return -EINVAL;
}
state = drm_atomic_get_new_plane_state(atomic_state, plane);
return _sde_plane_atomic_check(plane, state);
}
#else
static int sde_plane_atomic_check(struct drm_plane *plane,
struct drm_plane_state *state)
{
if (!plane || !state) {
SDE_ERROR("invalid arg(s), plane %d state %d\n",
!plane, !state);
return -EINVAL;
}
return _sde_plane_atomic_check(plane, state);
}
#endif
void sde_plane_flush(struct drm_plane *plane)
{
struct sde_plane *psde;