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

Commit 32822860 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: hide kernel addresses from unprevileged users"

parents c04a6158 97afcb7b

drivers/video/msm/mdss/mdp3.c

+8 −8
Original line number Diff line number Diff line
@@ -1125,7 +1125,7 @@ static int mdp3_res_init(void) 


	mdp3_res->ion_client = msm_ion_client_create(mdp3_res->pdev->name);

	if (IS_ERR_OR_NULL(mdp3_res->ion_client)) {

		pr_err("msm_ion_client_create() return error (%p)\n",

		pr_err("msm_ion_client_create() return error (%pK)\n",

				mdp3_res->ion_client);

		mdp3_res->ion_client = NULL;

		return -EINVAL;
@@ -1555,7 +1555,7 @@ void mdp3_unmap_iommu(struct ion_client *client, struct ion_handle *handle) 
	mutex_lock(&mdp3_res->iommu_lock);

	meta = mdp3_iommu_meta_lookup(table);

	if (!meta) {

		WARN(1, "%s: buffer was never mapped for %p\n", __func__,

		WARN(1, "%s: buffer was never mapped for %pK\n", __func__,

				handle);

		mutex_unlock(&mdp3_res->iommu_lock);

		return;
@@ -1581,7 +1581,7 @@ static void mdp3_iommu_meta_add(struct mdp3_iommu_meta *meta) 
		} else if (meta->table > entry->table) {

			p = &(*p)->rb_right;

		} else {

			pr_err("%s: handle %p already exists\n", __func__,

			pr_err("%s: handle %pK already exists\n", __func__,

				entry->handle);

			BUG();

		}
@@ -1644,7 +1644,7 @@ static int mdp3_iommu_map_iommu(struct mdp3_iommu_meta *meta, 
	ret = iommu_map_range(domain, meta->iova_addr + padding,

			table->sgl, size, prot);

	if (ret) {

		pr_err("%s: could not map %pa in domain %p\n",

		pr_err("%s: could not map %pa in domain %pK\n",

			__func__, &meta->iova_addr, domain);

			unmap_size = padding;

		goto out2;
@@ -1767,12 +1767,12 @@ int mdp3_self_map_iommu(struct ion_client *client, struct ion_handle *handle, 
		}

	} else {

		if (iommu_meta->flags != iommu_flags) {

			pr_err("%s: hndl %p already mapped with diff flag\n",

			pr_err("%s: hndl %pK already mapped with diff flag\n",

				__func__, handle);

			ret = -EINVAL;

			goto out_unlock;

		} else if (iommu_meta->mapped_size != iova_length) {

			pr_err("%s: hndl %p already mapped with diff len\n",

			pr_err("%s: hndl %pK already mapped with diff len\n",

				__func__, handle);

			ret = -EINVAL;

			goto out_unlock;
@@ -1806,7 +1806,7 @@ int mdp3_put_img(struct mdp3_img_data *data, int client) 
		fdput(data->srcp_f);

		memset(&data->srcp_f, 0, sizeof(struct fd));

	} else if (!IS_ERR_OR_NULL(data->srcp_dma_buf)) {

		pr_debug("ion hdl = %p buf=0x%pa\n", data->srcp_dma_buf,

		pr_debug("ion hdl = %pK buf=0x%pa\n", data->srcp_dma_buf,

							&data->addr);

		if (!iclient) {

			pr_err("invalid ion client\n");
@@ -1909,7 +1909,7 @@ done: 
		data->addr += img->offset;

		data->len -= img->offset;



		pr_debug("mem=%d ihdl=%p buf=0x%pa len=0x%lx\n",

		pr_debug("mem=%d ihdl=%pK buf=0x%pa len=0x%lx\n",

			img->memory_id, data->srcp_dma_buf,

			&data->addr, data->len);

drivers/video/msm/mdss/mdp3_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ retry_dma_done: 
retry_vsync:

		rc = wait_for_completion_timeout(&dma->vsync_comp,

			KOFF_TIMEOUT);

		pr_err("%s VID DMA Buff Addr %p\n", __func__, buf);

		pr_err("%s VID DMA Buff Addr %pK\n", __func__, buf);

		if (rc <= 0 && --retry_count) {

			int vsync = MDP3_REG_READ(MDP3_REG_INTR_STATUS) &

					(1 << MDP3_INTR_LCDC_START_OF_FRAME);

drivers/video/msm/mdss/mdp3_ppp_hwio.c

+3 −3
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ int config_ppp_op_mode(struct ppp_blit_op *blit_op) 
	pr_debug("ROI(x %d,y %d,w %d, h %d) ",

		blit_op->src.roi.x, blit_op->src.roi.y,

		blit_op->src.roi.width, blit_op->src.roi.height);

	pr_debug("Addr_P0 %p, Stride S0 %d Addr_P1 %p, Stride S1 %d\n",

	pr_debug("Addr_P0 %pK, Stride S0 %d Addr_P1 %pK, Stride S1 %d\n",

		blit_op->src.p0, blit_op->src.stride0,

		blit_op->src.p1, blit_op->src.stride1);
@@ -1320,7 +1320,7 @@ int config_ppp_op_mode(struct ppp_blit_op *blit_op) 
		pr_debug("ROI(x %d,y %d, w  %d, h %d) ",

			blit_op->bg.roi.x, blit_op->bg.roi.y,

			blit_op->bg.roi.width, blit_op->bg.roi.height);

		pr_debug("Addr %p, Stride S0 %d	Addr_P1 %p, Stride S1 %d\n",

		pr_debug("Addr %pK, Stride S0 %d Addr_P1 %pK, Stride S1 %d\n",

			blit_op->bg.p0,	blit_op->bg.stride0,

			blit_op->bg.p1,	blit_op->bg.stride1);

	}
@@ -1331,7 +1331,7 @@ int config_ppp_op_mode(struct ppp_blit_op *blit_op) 
	pr_debug("ROI(x %d,y %d, w %d, h %d) ",

		blit_op->dst.roi.x, blit_op->dst.roi.y,

		blit_op->dst.roi.width, blit_op->dst.roi.height);

	pr_debug("Addr %p, Stride S0 %d Addr_P1 %p, Stride S1 %d\n",

	pr_debug("Addr %pK, Stride S0 %d Addr_P1 %pK, Stride S1 %d\n",

		blit_op->dst.p0, blit_op->src.stride0,

		blit_op->dst.p1, blit_op->dst.stride1);

drivers/video/msm/mdss/mdss_compat_utils.c

+9 −9
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static struct mdp_input_layer32 *__create_layer_list32( 
			compat_ptr(commit32->commit_v1.input_layers),

			sizeof(struct mdp_input_layer32) * layer_count);

	if (ret) {

		pr_err("layer list32 copy from user failed, ptr %p\n",

		pr_err("layer list32 copy from user failed, ptr %pK\n",

			compat_ptr(commit32->commit_v1.input_layers));

		kfree(layer_list32);

		ret = -EFAULT;
@@ -182,7 +182,7 @@ static int __copy_scale_params(struct mdp_input_layer *layer, 
			sizeof(struct mdp_scale_data));

	if (ret) {

		kfree(scale);

		pr_err("scale param copy from user failed, ptr %p\n",

		pr_err("scale param copy from user failed, ptr %pK\n",

			compat_ptr(layer32->scale));

		ret = -EFAULT;

	} else {
@@ -309,7 +309,7 @@ static int __compat_atomic_commit(struct fb_info *info, unsigned int cmd, 
	ret = copy_from_user(&commit32, (void __user *)argp,

		sizeof(struct mdp_layer_commit32));

	if (ret) {

		pr_err("%s:copy_from_user failed, ptr %p\n", __func__,

		pr_err("%s:copy_from_user failed, ptr %pK\n", __func__,

			(void __user *)argp);

		ret = -EFAULT;

		return ret;
@@ -327,7 +327,7 @@ static int __compat_atomic_commit(struct fb_info *info, unsigned int cmd, 
				compat_ptr(commit32.commit_v1.output_layer),

				buffer_size);

		if (ret) {

			pr_err("fail to copy output layer from user, ptr %p\n",

			pr_err("fail to copy output layer from user, ptr %pK\n",

				compat_ptr(commit32.commit_v1.output_layer));

			ret = -EFAULT;

			goto layer_list_err;
@@ -3446,7 +3446,7 @@ static int __copy_layer_igc_lut_data_v1_7( 
			cfg_payload32,

			sizeof(struct mdp_igc_lut_data_v1_7_32));

	if (ret) {

		pr_err("copy from user failed, IGC cfg payload = %p\n",

		pr_err("copy from user failed, IGC cfg payload = %pK\n",

			cfg_payload32);

		ret = -EFAULT;

		goto exit;
@@ -3521,7 +3521,7 @@ static int __copy_layer_hist_lut_data_v1_7( 
			cfg_payload32,

			sizeof(struct mdp_hist_lut_data_v1_7_32));

	if (ret) {

		pr_err("copy from user failed, hist lut cfg_payload = %p\n",

		pr_err("copy from user failed, hist lut cfg_payload = %pK\n",

			cfg_payload32);

		ret = -EFAULT;

		goto exit;
@@ -3593,7 +3593,7 @@ static int __copy_layer_pa_data_v1_7( 
			cfg_payload32,

			sizeof(struct mdp_pa_data_v1_7_32));

	if (ret) {

		pr_err("copy from user failed, pa cfg_payload = %p\n",

		pr_err("copy from user failed, pa cfg_payload = %pK\n",

			cfg_payload32);

		ret = -EFAULT;

		goto exit;
@@ -3735,7 +3735,7 @@ static int __copy_layer_pp_info_pcc_params( 
			compat_ptr(pp_info32->pcc_cfg_data.cfg_payload),

			sizeof(struct mdp_pcc_data_v1_7));

		if (ret) {

			pr_err("compat copy of PCC cfg payload failed, ptr %p\n",

			pr_err("compat copy of PCC cfg payload failed, ptr %pK\n",

				compat_ptr(

				pp_info32->pcc_cfg_data.cfg_payload));

			ret = -EFAULT;
@@ -3769,7 +3769,7 @@ static int __copy_layer_pp_info_params(struct mdp_input_layer *layer, 
			compat_ptr(layer32->pp_info),

			sizeof(struct mdp_overlay_pp_params32));

	if (ret) {

		pr_err("pp info copy from user failed, pp_info %p\n",

		pr_err("pp info copy from user failed, pp_info %pK\n",

			compat_ptr(layer32->pp_info));

		ret = -EFAULT;

		goto exit;

drivers/video/msm/mdss/mdss_debug.c

+3 −3
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ static inline struct mdss_mdp_misr_map *mdss_misr_get_map(u32 block_id, 
		return NULL;

	}



	pr_debug("MISR Module(%d) CTRL(0x%x) SIG(0x%x) intf_base(0x%p)\n",

	pr_debug("MISR Module(%d) CTRL(0x%x) SIG(0x%x) intf_base(0x%pK)\n",

			block_id, map->ctrl_reg, map->value_reg, intf_base);

	return map;

}
@@ -1435,7 +1435,7 @@ int mdss_misr_set(struct mdss_data_type *mdata, 
	bool use_mdp_up_misr = false;



	if (!mdata || !req || !ctl) {

		pr_err("Invalid input params: mdata = %p req = %p ctl = %p",

		pr_err("Invalid input params: mdata = %pK req = %pK ctl = %pK",

			mdata, req, ctl);

		return -EINVAL;

	}
@@ -1515,7 +1515,7 @@ int mdss_misr_set(struct mdss_data_type *mdata, 


		writel_relaxed(config,

				mdata->mdp_base + map->ctrl_reg);

		pr_debug("MISR_CTRL=0x%x [base:0x%p reg:0x%x config:0x%x]\n",

		pr_debug("MISR_CTRL=0x%x [base:0x%pK reg:0x%x config:0x%x]\n",

				readl_relaxed(mdata->mdp_base + map->ctrl_reg),

				mdata->mdp_base, map->ctrl_reg, config);

	}