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 3713A1D0E16; Wed, 2 Oct 2024 14:10:59 +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=1727878259; cv=none; b=h1Yprtt3PbOmF0Pk4RtMZ+l6LFCfDVPyAetGepUQbstF0BwTYGAQmw5+3hbQvcymYv88psh/fGeFw0/Oiq+Eb5Jm3zXU2mVmk5geDfggoh7un9fzx2sASFrHEWSOYVopa1JGbpS7FzBpLITYbcRB6L2mtoeqJxHtp2Az3uQ+cJo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727878259; c=relaxed/simple; bh=XmPNT3WOHIAvhQptb7zv8Fk1BY4SSS2GDJ9tghZSr54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FWihFp4JuycgA/pQ9POkCAoDDIj7APeniSv6EWhnQ/5wr4fJWMUC+OxYvUbX8ZqW+k7KxoQsyGwVvkftydt89DUgmpNj6EYetp9WOLHRAfX7qSg4fuxxYqu+4SHuCiZpLM+4u65w2oDiuF0UNGUTKbVC033k2R5v+VzRUo0JqWU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KAPN7B9H; 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="KAPN7B9H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3769C4CEC2; Wed, 2 Oct 2024 14:10:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727878259; bh=XmPNT3WOHIAvhQptb7zv8Fk1BY4SSS2GDJ9tghZSr54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KAPN7B9H91gj7lZ2mqYVmCrVDvdmzbGwvvFsCKv0pMmhDlWsuGIVDcbhM2RXxyJB1 2elJoQoVmpYIq3XyZNEtA4hZfR0BiT7V5xjKPRup5oQvBxmcYqVbrLuce5ur+hQuHm uVvy1SJIqLh/IT5pvu4/F7C87js9YhB7NaceNkSc= 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 353/634] media: mediatek: vcodec: Fix VP8 stateless decoder smatch warning Date: Wed, 2 Oct 2024 14:57:33 +0200 Message-ID: <20241002125825.031015397@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 b113bc7c0e83b32f4dd2d291a2b6c4803e0a2c44 ] Fix a smatch static checker warning on vdec_vp8_req_if.c. Which leads to a kernel crash when fb is NULL. Fixes: 7a7ae26fd458 ("media: mediatek: vcodec: support stateless VP8 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_vp8_req_if.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c index e27e728f392e6..232ef3bd246a3 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c @@ -334,14 +334,18 @@ static int vdec_vp8_slice_decode(void *h_vdec, struct mtk_vcodec_mem *bs, src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); fb = inst->ctx->dev->vdec_pdata->get_cap_buffer(inst->ctx); - dst_buf_info = container_of(fb, struct mtk_video_dec_buf, frame_buffer); + if (!fb) { + mtk_vdec_err(inst->ctx, "fb buffer is NULL"); + return -ENOMEM; + } - y_fb_dma = fb ? (u64)fb->base_y.dma_addr : 0; + dst_buf_info = container_of(fb, struct mtk_video_dec_buf, frame_buffer); + y_fb_dma = fb->base_y.dma_addr; if (inst->ctx->q_data[MTK_Q_DATA_DST].fmt->num_planes == 1) c_fb_dma = y_fb_dma + inst->ctx->picinfo.buf_w * inst->ctx->picinfo.buf_h; else - c_fb_dma = fb ? (u64)fb->base_c.dma_addr : 0; + c_fb_dma = fb->base_c.dma_addr; inst->vsi->dec.bs_dma = (u64)bs->dma_addr; inst->vsi->dec.bs_sz = bs->size; -- 2.43.0