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

disp: msm: add proper null checks and propagate error

Browse Source 
Fix possible null pointer dereferencing and propagate error
code during early return.

Signed-off-by: Samantha Tran <samtran@codeaurora.org>
This commit is contained in:
Samantha Tran
2019-08-06 13:46:48 -07:00
parent c70f647143
commit c00bf10768
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
msm/dp/dp_drm.c
View File

@@ -493,12 +493,17 @@ int dp_connector_atomic_check(struct drm_connector *connector,
struct drm_connector_state *c_state) struct drm_connector_state *c_state)
{ {
struct sde_connector *sde_conn; struct sde_connector *sde_conn;
struct drm_connector_state *old_state = struct drm_connector_state *old_state;
drm_atomic_get_old_connector_state(c_state->state, connector);
if (!connector || !display) if (!connector || !display)
return -EINVAL; return -EINVAL;
old_state =
drm_atomic_get_old_connector_state(c_state->state, connector);
if (!old_state)
return -EINVAL;
sde_conn = to_sde_connector(connector); sde_conn = to_sde_connector(connector);
/* /*

4
msm/msm_fb.c
View File

@@ -378,8 +378,10 @@ struct drm_framebuffer *msm_framebuffer_init(struct drm_device *dev,
const struct drm_format_info *info; const struct drm_format_info *info;
info = drm_format_info(mode_cmd->pixel_format); info = drm_format_info(mode_cmd->pixel_format);
if (!info || num_planes > ARRAY_SIZE(info->cpp)) if (!info || num_planes > ARRAY_SIZE(info->cpp)) {
ret = -EINVAL;
goto fail; goto fail;
}
for (i = 0; i < num_planes; i++) { for (i = 0; i < num_planes; i++) {
unsigned int width = mode_cmd->width / (i ? hsub : 1); unsigned int width = mode_cmd->width / (i ? hsub : 1);