Patch "media: mediatek: vcodec: Handle invalid encoder vsi" has been added to the 6.6-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    media: mediatek: vcodec: Handle invalid encoder vsi

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     media-mediatek-vcodec-handle-invalid-encoder-vsi.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 0d1ec079dc1bf73ff338dba8db6374852b16b908
Author: Irui Wang <irui.wang@xxxxxxxxxxxx>
Date:   Sat Oct 7 19:33:47 2023 +0800

    media: mediatek: vcodec: Handle invalid encoder vsi
    
    [ Upstream commit 19e2e01f30b5d2b448b5db097130486ea95af36f ]
    
    Handle invalid encoder vsi in vpu_enc_init to ensure the encoder
    vsi is valid for future use.
    
    Fixes: 1972e32431ed ("media: mediatek: vcodec: Fix possible invalid memory access for encoder")
    
    Signed-off-by: Irui Wang <irui.wang@xxxxxxxxxxxx>
    Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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 ae6290d28f8e9..84ad1cc6ad171 100644
--- a/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
+++ b/drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c
@@ -154,6 +154,11 @@ int vpu_enc_init(struct venc_vpu_inst *vpu)
 		return -EINVAL;
 	}
 
+	if (IS_ERR_OR_NULL(vpu->vsi)) {
+		mtk_venc_err(vpu->ctx, "invalid venc vsi");
+		return -EINVAL;
+	}
+
 	return 0;
 }