Unverified Commit 8f623512 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9665 CVE-2024-38622 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YKJVJ6GAY62SSEBJQYCYIWLTTNKPAVUS/ 
Aleksandr Mishin (1):
  drm/msm/dpu: Add callback function pointer check before its call

Dmitry Baryshkov (6):
  drm/msm/dpu: remove irq_idx argument from IRQ callbacks
  drm/msm/dpu: extract dpu_core_irq_is_valid() helper
  drm/msm/dpu: add helper to get IRQ-related data
  drm/msm/dpu: make the irq table size static
  drm/msm/dpu: stop using raw IRQ indices in the kernel output
  drm/msm/dpu: make error messages at dpu_core_irq_register_callback()
    more sensible


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/IA7D6V 
 
Link:https://gitee.com/openeuler/kernel/pulls/9665

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents a89f0dfe acb04cd4

drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ u32 dpu_core_irq_read( 
int dpu_core_irq_register_callback(

		struct dpu_kms *dpu_kms,

		int irq_idx,

		void (*irq_cb)(void *arg, int irq_idx),

		void (*irq_cb)(void *arg),

		void *irq_arg);



/**

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c

+15 −15
Original line number Diff line number Diff line
@@ -357,8 +357,8 @@ static int dpu_encoder_helper_wait_event_timeout(int32_t drm_id, 
		u32 irq_idx, struct dpu_encoder_wait_info *info);



int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,

		int irq,

		void (*func)(void *arg, int irq_idx),

		int irq_idx,

		void (*func)(void *arg),

		struct dpu_encoder_wait_info *wait_info)

{

	u32 irq_status;
@@ -372,54 +372,54 @@ int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc, 


	/* return EWOULDBLOCK since we know the wait isn't necessary */

	if (phys_enc->enable_state == DPU_ENC_DISABLED) {

		DRM_ERROR("encoder is disabled id=%u, callback=%ps, irq=%d\n",

		DRM_ERROR("encoder is disabled id=%u, callback=%ps, IRQ=[%d, %d]\n",

			  DRMID(phys_enc->parent), func,

			  irq);

			  DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));

		return -EWOULDBLOCK;

	}



	if (irq < 0) {

	if (irq_idx < 0) {

		DRM_DEBUG_KMS("skip irq wait id=%u, callback=%ps\n",

			      DRMID(phys_enc->parent), func);

		return 0;

	}



	DRM_DEBUG_KMS("id=%u, callback=%ps, irq=%d, pp=%d, pending_cnt=%d\n",

	DRM_DEBUG_KMS("id=%u, callback=%ps, IRQ=[%d, %d], pp=%d, pending_cnt=%d\n",

		      DRMID(phys_enc->parent), func,

		      irq, phys_enc->hw_pp->idx - PINGPONG_0,

		      DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), phys_enc->hw_pp->idx - PINGPONG_0,

		      atomic_read(wait_info->atomic_cnt));



	ret = dpu_encoder_helper_wait_event_timeout(

			DRMID(phys_enc->parent),

			irq,

			irq_idx,

			wait_info);



	if (ret <= 0) {

		irq_status = dpu_core_irq_read(phys_enc->dpu_kms, irq);

		irq_status = dpu_core_irq_read(phys_enc->dpu_kms, irq_idx);

		if (irq_status) {

			unsigned long flags;



			DRM_DEBUG_KMS("irq not triggered id=%u, callback=%ps, irq=%d, pp=%d, atomic_cnt=%d\n",

			DRM_DEBUG_KMS("IRQ=[%d, %d] not triggered id=%u, callback=%ps, pp=%d, atomic_cnt=%d\n",

				      DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx),

				      DRMID(phys_enc->parent), func,

				      irq,

				      phys_enc->hw_pp->idx - PINGPONG_0,

				      atomic_read(wait_info->atomic_cnt));

			local_irq_save(flags);

			func(phys_enc, irq);

			func(phys_enc);

			local_irq_restore(flags);

			ret = 0;

		} else {

			ret = -ETIMEDOUT;

			DRM_DEBUG_KMS("irq timeout id=%u, callback=%ps, irq=%d, pp=%d, atomic_cnt=%d\n",

			DRM_DEBUG_KMS("IRQ=[%d, %d] timeout id=%u, callback=%ps, pp=%d, atomic_cnt=%d\n",

				      DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx),

				      DRMID(phys_enc->parent), func,

				      irq,

				      phys_enc->hw_pp->idx - PINGPONG_0,

				      atomic_read(wait_info->atomic_cnt));

		}

	} else {

		ret = 0;

		trace_dpu_enc_irq_wait_success(DRMID(phys_enc->parent),

			func, irq,

			func, irq_idx,

			phys_enc->hw_pp->idx - PINGPONG_0,

			atomic_read(wait_info->atomic_cnt));

	}

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys *phys_enc, 
 */

int dpu_encoder_helper_wait_for_irq(struct dpu_encoder_phys *phys_enc,

		int irq,

		void (*func)(void *arg, int irq_idx),

		void (*func)(void *arg),

		struct dpu_encoder_wait_info *wait_info);



/**

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c

+4 −4
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( 
		phys_enc->hw_intf->ops.program_intf_cmd_cfg(phys_enc->hw_intf, &cmd_mode_cfg);

}



static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx)

static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg)

{

	struct dpu_encoder_phys *phys_enc = arg;

	unsigned long lock_flags;
@@ -103,7 +103,7 @@ static void dpu_encoder_phys_cmd_pp_tx_done_irq(void *arg, int irq_idx) 
	DPU_ATRACE_END("pp_done_irq");

}



static void dpu_encoder_phys_cmd_te_rd_ptr_irq(void *arg, int irq_idx)

static void dpu_encoder_phys_cmd_te_rd_ptr_irq(void *arg)

{

	struct dpu_encoder_phys *phys_enc = arg;

	struct dpu_encoder_phys_cmd *cmd_enc;
@@ -126,7 +126,7 @@ static void dpu_encoder_phys_cmd_te_rd_ptr_irq(void *arg, int irq_idx) 
	DPU_ATRACE_END("rd_ptr_irq");

}



static void dpu_encoder_phys_cmd_ctl_start_irq(void *arg, int irq_idx)

static void dpu_encoder_phys_cmd_ctl_start_irq(void *arg)

{

	struct dpu_encoder_phys *phys_enc = arg;
@@ -139,7 +139,7 @@ static void dpu_encoder_phys_cmd_ctl_start_irq(void *arg, int irq_idx) 
	DPU_ATRACE_END("ctl_start_irq");

}



static void dpu_encoder_phys_cmd_underrun_irq(void *arg, int irq_idx)

static void dpu_encoder_phys_cmd_underrun_irq(void *arg)

{

	struct dpu_encoder_phys *phys_enc = arg;

drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static void dpu_encoder_phys_vid_setup_timing_engine( 
	programmable_fetch_config(phys_enc, &timing_params);

}



static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx)

static void dpu_encoder_phys_vid_vblank_irq(void *arg)

{

	struct dpu_encoder_phys *phys_enc = arg;

	struct dpu_hw_ctl *hw_ctl;
@@ -337,7 +337,7 @@ static void dpu_encoder_phys_vid_vblank_irq(void *arg, int irq_idx) 
	DPU_ATRACE_END("vblank_irq");

}



static void dpu_encoder_phys_vid_underrun_irq(void *arg, int irq_idx)

static void dpu_encoder_phys_vid_underrun_irq(void *arg)

{

	struct dpu_encoder_phys *phys_enc = arg;