From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0FEC1D0E16; Wed, 2 Oct 2024 14:11:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727878265; cv=none; b=o+VYXeEHTDFhgcLOEcYoIYWSvoAskMfmzCs0821Y0aF4YrEeipZNE5llspFp8Pf5yb0TbxbLZ6CPQTS0fVnmUqxclACD2uwL5l1dxdghLIP8UPvNoV3tm1iWIzhR/tnKJLZac8LpOsExChRLtfVWQqrB6pLDZs5YbC+ls57drnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727878265; c=relaxed/simple; bh=vIfzvCnWz6brZAAICbrtQIBq0Ngq1fGiOP5zT6DXScE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Bx+S1Yd9rVJysblQIYw0UtFbi/44GIgc/+cOLcJXPVZmpdpdjK3ZRodFyJldYQZyQ9aBaO66g1J/1WRwYq+6kd3DieLUykjR94oybKiumL8hBRMFDcwwQLoTrk3svwGLASr5NynLW5chaZKw/V0QtMONt/wvNZUe6fiwqFdh2fw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ExkinT8Y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ExkinT8Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A585C4CEC2; Wed, 2 Oct 2024 14:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727878264; bh=vIfzvCnWz6brZAAICbrtQIBq0Ngq1fGiOP5zT6DXScE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ExkinT8YSW9sW3sbomZy26j6Kg/CBXFkJBvMBONXdHZEJUdzeHm7iCX6AFbNer6FL eLoKVFTmIiBMb0dAwU3maY64XjOefgcDbiDsdjQzzv22Z7VU1Xv8vbyvTB/4TKqnw8 8cn+yghmkUO3rgB4zl+K3cd8q94P7/JfONnEGXU0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yunfei Dong , AngeloGioacchino Del Regno , Sebastian Fricke , Hans Verkuil , Sasha Levin Subject: [PATCH 6.10 354/634] media: mediatek: vcodec: Fix H264 stateless decoder smatch warning Date: Wed, 2 Oct 2024 14:57:34 +0200 Message-ID: <20241002125825.069585440@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yunfei Dong [ Upstream commit 7878d3a385efab560dce793b595447867fb163f2 ] Fix a smatch static checker warning on vdec_h264_req_if.c. Which leads to a kernel crash when fb is NULL. Fixes: 06fa5f757dc5 ("media: mtk-vcodec: vdec: support stateless H.264 decoding") Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Sebastian Fricke Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- .../mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c index 73d5cef33b2ab..1e1b32faac77b 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c @@ -347,11 +347,16 @@ static int vdec_h264_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs, return vpu_dec_reset(vpu); fb = inst->ctx->dev->vdec_pdata->get_cap_buffer(inst->ctx); + if (!fb) { + mtk_vdec_err(inst->ctx, "fb buffer is NULL"); + return -ENOMEM; + } + src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); dst_buf_info = container_of(fb, struct mtk_video_dec_buf, frame_buffer); - y_fb_dma = fb ? (u64)fb->base_y.dma_addr : 0; - c_fb_dma = fb ? (u64)fb->base_c.dma_addr : 0; + y_fb_dma = fb->base_y.dma_addr; + c_fb_dma = fb->base_c.dma_addr; mtk_vdec_debug(inst->ctx, "+ [%d] FB y_dma=%llx c_dma=%llx va=%p", inst->num_nalu, y_fb_dma, c_fb_dma, fb); -- 2.43.0