Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a63934ee authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Fix out of bound access of array indexes"

parents 39ae4ef9 f5bf72b0

drivers/video/fbdev/msm/mdss_hdmi_tx.c

+4 −2
Original line number Diff line number Diff line
@@ -70,8 +70,10 @@ 
#define HDMI_TX_3_MAX_PCLK_RATE            297000

#define HDMI_TX_4_MAX_PCLK_RATE            600000



#define hdmi_tx_get_fd(x) (x ? hdmi_ctrl->feature_data[ffs(x) - 1] : 0)

#define hdmi_tx_set_fd(x, y) {if (x) hdmi_ctrl->feature_data[ffs(x) - 1] = y; }

#define hdmi_tx_get_fd(x) ((x && (ffs(x) > 0))  ? \

			hdmi_ctrl->feature_data[ffs(x) - 1] : 0)

#define hdmi_tx_set_fd(x, y) {if (x && (ffs(x) > 0)) \

			hdmi_ctrl->feature_data[ffs(x) - 1] = y; }



#define MAX_EDID_READ_RETRY	5

drivers/video/fbdev/msm/mdss_mdp_pipe.c

+12 −11
Original line number Diff line number Diff line
@@ -934,6 +934,7 @@ int mdss_mdp_smp_handoff(struct mdss_data_type *mdata) 
		data = readl_relaxed(mdata->mdp_base +

			MDSS_MDP_REG_SMP_ALLOC_W0 + off);

		client_id = (data >> s) & 0xFF;

		if (i < ARRAY_SIZE(mdata->mmb_alloc_map))

			if (test_bit(i, mdata->mmb_alloc_map)) {

				/*

				 * Certain pipes may have a dedicated set of