evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm/sde: fix array overflow"

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-24 02:46:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8696c16cbb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gpu/drm/msm/sde/sde_hw_catalog.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -1205,7 +1205,7 @@ static int sde_mixer_parse_dt(struct device_node *np,
if (!prop_exists[MIXER_LEN])
mixer->len = DEFAULT_SDE_HW_BLOCK_LEN;
if (lm_pair_mask[i])
if ((i < ARRAY_SIZE(lm_pair_mask)) && lm_pair_mask[i])
mixer->lm_pair_mask = 1 << lm_pair_mask[i];
sblk->maxblendstages = max_blendstages;