Re: [PATCH 1/2] media: mediatek: vcodec: Fix encoder access NULL pointer

From: Hans Verkuil
Date: Wed Oct 04 2023 - 02:54:34 EST


Ping! Is this a fix for 6.6 or not?

Regards,

Hans

On 02/10/2023 12:24, Hans Verkuil wrote:
> On 26/09/2023 12:19, Irui Wang wrote:
>> Need to set the private data with encoder device, or will access
>> NULL pointer in encoder handler.
>>
>> Fixes: 1972e32431ed ("media: mediatek: vcodec: Fix possible invalid memory access for encoder")
>>
>> Signed-off-by: Irui Wang <irui.wang@xxxxxxxxxxxx>
>> ---
>> drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
>> index d299cc2962a5..ae6290d28f8e 100644
>> --- a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
>> +++ b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
>> @@ -138,7 +138,8 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
>> vpu->ctx->vpu_inst = vpu;
>>
>> status = mtk_vcodec_fw_ipi_register(vpu->ctx->dev->fw_handler, vpu->id,
>> - vpu_enc_ipi_handler, "venc", NULL);
>> + vpu_enc_ipi_handler, "venc",
>> + vpu->ctx->dev);
>>
>> if (status) {
>> mtk_venc_err(vpu->ctx, "vpu_ipi_register fail %d", status);
>
> Is this a fix that should go to 6.6?
>
> Regards,
>
> Hans