Commit acb04cd4 authored Jul 03, 2024 by Dmitry Baryshkov Committed by Yongqiang Liu Jul 03, 2024

drm/msm/dpu: make error messages at dpu_core_irq_register_callback() more sensible

mainline inclusion
from mainline-v6.9-rc4
commit 8844f467d6a58dc915f241e81c46e0c126f8c070
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7D6V
CVE: CVE-2024-38622

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8844f467d6a58dc915f241e81c46e0c126f8c070



--------------------------------

There is little point in using %ps to print a value known to be NULL. On
the other hand it makes sense to print the callback symbol in the
'invalid IRQ' message. Correct those two error messages to make more
sense.

Fixes: 6893199183f8 ("drm/msm/dpu: stop using raw IRQ indices in the kernel output")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/585565/
Link: https://lore.kernel.org/r/20240330-dpu-irq-messages-v1-1-9ce782ae35f9@linaro.org


Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: Rui Xiang <rui.xiang@huawei.com>

parent 2d373253

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -525,14 +525,14 @@ int dpu_core_irq_register_callback(struct dpu_kms *dpu_kms, int irq_idx,
		int ret;

		if (!irq_cb) {
		DPU_ERROR("invalid IRQ=[%d, %d] irq_cb:%ps\n",
		DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), irq_cb);
		DPU_ERROR("IRQ=[%d, %d] NULL callback\n",
		DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
		return -EINVAL;
		}

		if (!dpu_core_irq_is_valid(irq_idx)) {
		DPU_ERROR("invalid IRQ=[%d, %d]\n",
		DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx));
		DPU_ERROR("invalid IRQ=[%d, %d] irq_cb:%ps\n",
		DPU_IRQ_REG(irq_idx), DPU_IRQ_BIT(irq_idx), irq_cb);
		return -EINVAL;
		}