From nobody Thu Sep 19 23:13:59 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (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 586CD13D529; Thu, 13 Jun 2024 09:34:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718271251; cv=none; b=mRhjWGrPT5OBKMMn1BRyqmbJh2QOqw59aOnQvFbh/dVga4IelZCY5tqhFCmokaqsD5+l7vEFiUe/Cev5MGlF1CI/3RhCPaeqHjOXGVDbxvoD2joqXgdLgBDbJzbG8NiaWNlOsOBWPerjMKg22uEmNFmR0IYjJRq/Gwe8vVDgZhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718271251; c=relaxed/simple; bh=E8Dj8RTCeKVdFk78jUZNihxjqnFkD5PF8f/iewJazcI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YKRKC5TQindatkU3g0wnFbZuUJaoO/C6jfnY9igl7BZ7n+3+mXcWRJFwXpH3nlQrPolEF9kStfxMzrwqXISUcEmgyUS3mOaAyqhIAt/hhWNJ/KoPSko7dAiqv6oFMUqYh67oCnffkYSmP5iW70nbcO63VTAwvnikqaqhXbvptXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=vEzJt+4W; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="vEzJt+4W" X-UUID: 11fbd522296811efa22eafcdcd04c131-20240613 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=1UKaAEi8SfdWcfTGfQXa3jKApmhHrlsIfivXZeA+g6U=; b=vEzJt+4W2E2EpPgEWATGlWzVwq1hGDTZdg5nX3uQ0ndWFHNPMqk2vXrDw+YX4uxehN+JNbiECoLTHzqBjhqr7zsuGZ+UpiXYqh7F24/d3t3AZtZ977LU3GZt1+I3DlfQWfJYJDozjZFAU4S8d0TW7X27ofBeJEeJk71H9FtbR3I=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.39,REQID:719b046b-ba86-4959-a47f-0d9c88e3957e,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:393d96e,CLOUDID:84d7f193-e2c0-40b0-a8fe-7c7e47299109,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 11fbd522296811efa22eafcdcd04c131-20240613 Received: from mtkmbs13n1.mediatek.inc [(172.21.101.193)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1448756589; Thu, 13 Jun 2024 17:34:02 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 13 Jun 2024 17:34:01 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 13 Jun 2024 17:34:00 +0800 From: Yunfei Dong To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Sebastian Fricke , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , Nathan Hebert , Andrzej Pietrasiewicz CC: Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , Yunfei Dong , , , , , , Subject: [PATCH v2 1/3] media: mediatek: vcodec: fix h264 multi statless decoder smatch warning Date: Thu, 13 Jun 2024 17:33:55 +0800 Message-ID: <20240613093357.583-2-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240613093357.583-1-yunfei.dong@mediatek.com> References: <20240613093357.583-1-yunfei.dong@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MTK: N Content-Type: text/plain; charset="utf-8" Fix smatch static checker warning for vdec_h264_req_multi_if.c. Leading to kernel crash when fb is NULL. Fixes: 397edc703a10 ("media: mediatek: vcodec: add h264 decoder") Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno --- .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_= req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h= 264_req_multi_if.c index 2d4611e7fa0b..1ed0ccec5665 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_mul= ti_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_mul= ti_if.c @@ -724,11 +724,16 @@ static int vdec_h264_slice_single_decode(void *h_vdec= , struct mtk_vcodec_mem *bs return vpu_dec_reset(vpu); =20 fb =3D 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 =3D container_of(bs, struct mtk_video_dec_buf, bs_buffer); dst_buf_info =3D container_of(fb, struct mtk_video_dec_buf, frame_buffer); =20 - y_fb_dma =3D fb ? (u64)fb->base_y.dma_addr : 0; - c_fb_dma =3D fb ? (u64)fb->base_c.dma_addr : 0; + y_fb_dma =3D fb->base_y.dma_addr; + c_fb_dma =3D fb->base_c.dma_addr; mtk_vdec_debug(inst->ctx, "[h264-dec] [%d] y_dma=3D%llx c_dma=3D%llx", inst->ctx->decoded_frame_cnt, y_fb_dma, c_fb_dma); =20 --=20 2.18.0 From nobody Thu Sep 19 23:13:59 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (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 47690140383; Thu, 13 Jun 2024 09:34:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718271254; cv=none; b=AUld0E7bNBHBq5g+CFsOJPaGt9i8upBuVsp2IDwopjIli1kV01w98Pl/kGMnjvEm6/335GZiGCPA+5KfarNQdgbjtfCn951ZWVL7rKisq/4ebmrD5kX4TyayJZmlizss7VKis+ADaUmj0Jh0kiT3+ccHyv2qCNaM/n2ub46mUvQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718271254; c=relaxed/simple; bh=Is62tAHfEk+9Yu83wvMsu1vlj9t8KP/x5KrX3bBovik=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ALD+lrQPHkXMmoEPiqb8uDV7wUN+7JmOIvrcMZKniubWIkV1tzbiKtfwubRIimwSDH4Jvkpbh29jAAMORJiflQUMgvuINVj51v64vSUznGK0ufppMofblsbsrwZuNUuzeg59YxnxPUG3WhiZTMJce84eLmfp1vsCucQ3aB4uvp8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=BGYVVHWQ; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="BGYVVHWQ" X-UUID: 1325593c296811efa22eafcdcd04c131-20240613 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=pby+/hqkJE/CzcRR1xGYBA9igKHmA+L2OnFUaI9UPwc=; b=BGYVVHWQjazqDywqnDvg1nHmn2DknRUSZ9HnhSh6cJx+jx+I5tFR8B/+Gsb29/BsCpE/J/foJ3LrRQtC2ICzcOmNkIjQvhVKQ+BTbAn2ERRqEY55vcPOqQk1WmDkmxMgejGPn93KoF29LarXUX+Ewwy86OMHYfXRrMzNivhB4PQ=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.39,REQID:58d47724-c8a0-41be-ab03-cb5b17da9634,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:393d96e,CLOUDID:de488844-4544-4d06-b2b2-d7e12813c598,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 1325593c296811efa22eafcdcd04c131-20240613 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 2121973281; Thu, 13 Jun 2024 17:34:04 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 13 Jun 2024 17:34:02 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 13 Jun 2024 17:34:01 +0800 From: Yunfei Dong To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Sebastian Fricke , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , Nathan Hebert , Andrzej Pietrasiewicz CC: Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , "Yunfei Dong" , , , , , , Subject: [PATCH v2 2/3] media: mediatek: vcodec: fix vp8 stateless decoder smatch warning Date: Thu, 13 Jun 2024 17:33:56 +0800 Message-ID: <20240613093357.583-3-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240613093357.583-1-yunfei.dong@mediatek.com> References: <20240613093357.583-1-yunfei.dong@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--6.149600-8.000000 X-TMASE-MatchedRID: eyg11LmjlNWoft0ZW3r/iTCaEJt46PppPtDsRiRP0d9h2fnHe1cil/Rm 0kmqtH+DgHpD5xuuxKghg4hY1jreIwLz+AfRlRoHoprTEHvewACuiRuR9mCaujedlpL1W1muo8W MkQWv6iXBcIE78YqRWvcUt5lc1lLgRktVxdpRt2LJJDKI2wSGPXZYf4I7zh9XRl1VuAE0tgNlVD g+1TaX7p6oP1a0mRIj X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--6.149600-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 6904F484E0D17E05173576915F85BA6F6D22F5EB803B6C05D060F2EA5985B8F92000:8 X-MTK: N Content-Type: text/plain; charset="utf-8" Fix smatch static checker warning for vdec_vp8_req_if.c. Leading to kernel crash when fb is NULL. Fixes: 7a7ae26fd458 ("media: mediatek: vcodec: support stateless VP8 decodi= ng") Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno --- .../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_r= eq_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_= if.c index e27e728f392e..232ef3bd246a 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 =3D container_of(bs, struct mtk_video_dec_buf, bs_buffer); =20 fb =3D inst->ctx->dev->vdec_pdata->get_cap_buffer(inst->ctx); - dst_buf_info =3D container_of(fb, struct mtk_video_dec_buf, frame_buffer); + if (!fb) { + mtk_vdec_err(inst->ctx, "fb buffer is NULL"); + return -ENOMEM; + } =20 - y_fb_dma =3D fb ? (u64)fb->base_y.dma_addr : 0; + dst_buf_info =3D container_of(fb, struct mtk_video_dec_buf, frame_buffer); + y_fb_dma =3D fb->base_y.dma_addr; if (inst->ctx->q_data[MTK_Q_DATA_DST].fmt->num_planes =3D=3D 1) c_fb_dma =3D y_fb_dma + inst->ctx->picinfo.buf_w * inst->ctx->picinfo.buf_h; else - c_fb_dma =3D fb ? (u64)fb->base_c.dma_addr : 0; + c_fb_dma =3D fb->base_c.dma_addr; =20 inst->vsi->dec.bs_dma =3D (u64)bs->dma_addr; inst->vsi->dec.bs_sz =3D bs->size; --=20 2.18.0 From nobody Thu Sep 19 23:14:00 2024 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (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 BA78913E8BF; Thu, 13 Jun 2024 09:34:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718271252; cv=none; b=a5bxNRU2aZWteA2LDUk9R29AnDv7J8M3FjtjX45ewy4Zdlj8q0kVE9oIoM7M31qNiUbBNbMp77dlzyc7DXRlfQtW4O1m0s2J+MV5cWQBvbCKPr+KXqNGiCEKdZRT1Dmo1RSzPJ2xS1VAOCrhrvM9Rz6GwhbeXNArsSyQhYw9HIs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718271252; c=relaxed/simple; bh=jhaAuwnbgG29/fCDupcOxfn/oo16sEA5Mdt/d56ai4k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Q9V421CerQyMGJPTGatMCJO2z2VAs73JHeTVCz1r9cyD5qiPFHpotonOUhTBQ/kleHDAWe+njfBfnTq2Ei1AD1Q7eXiGBMEcbKdIf0iQJtMb2XLXAG9pM/TWt5EftuYuuQsNxi1t/dB3yrIpVw5jUkUnTqA5Ch/2ozh6pMJopEs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=DZFNhL+H; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="DZFNhL+H" X-UUID: 1328cfcc296811efa22eafcdcd04c131-20240613 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=Fj+e1QsKU5Ji35g9aZ9RFH1JnKkoB0lBYUlGTIe+08w=; b=DZFNhL+Hfyb3gTU2hYEBr1Uzv0i11u1YWZjHOz6LaT/nfLbfVqAm0QUwf8zgbYDkTa8VeRxdS2XOAyD4pwd+NsbEPR22QJIj5+ZFzM/LTXBEn3qY6WgODgILhe3i9C5gbySLoC32d3f8D9rrQNczf4bhemsVeYFFTW18Uwc5Obo=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.39,REQID:ce6951d2-5221-4e0d-a52b-b5f83351349b,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:393d96e,CLOUDID:a7f28a88-8d4f-477b-89d2-1e3bdbef96d1,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 1328cfcc296811efa22eafcdcd04c131-20240613 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1567123446; Thu, 13 Jun 2024 17:34:04 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 13 Jun 2024 17:34:03 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 13 Jun 2024 17:34:02 +0800 From: Yunfei Dong To: =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , Sebastian Fricke , Nicolas Dufresne , Hans Verkuil , AngeloGioacchino Del Regno , Benjamin Gaignard , Nathan Hebert , Andrzej Pietrasiewicz CC: Hsin-Yi Wang , Fritz Koenig , Daniel Vetter , Steve Cho , "Yunfei Dong" , , , , , , Subject: [PATCH v2 3/3] media: mediatek: vcodec: fix h264 stateless decoder smatch warning Date: Thu, 13 Jun 2024 17:33:57 +0800 Message-ID: <20240613093357.583-4-yunfei.dong@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240613093357.583-1-yunfei.dong@mediatek.com> References: <20240613093357.583-1-yunfei.dong@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-Product-Ver: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-AS-Result: No-10--3.129400-8.000000 X-TMASE-MatchedRID: 6efVvalF+Gioft0ZW3r/iTCaEJt46PppPtDsRiRP0d9h2fnHe1cil/Rm 0kmqtH+DgHpD5xuuxKghg4hY1jreIz1/tvmVhm3Z4RtSDjG+z7An8jQhMLowhTb9TB28UbkiGd2 282fApofi8zVgXoAltsIJ+4gwXrEtwrbXMGDYqV/ClX+2r3j3WDRT/I/BBHwITHBVEG6vjoTaBw jHzSg+qiZNezEAhIbllzt00UpdO3Vn/s7tNNnb98Fx8NfhvvdfIlHoet1GO9L18oxPF4/ixaMnT JRI0XInfXwUEm1ouDzLDYxFC1/7rjCBQDy1BJScwL6SxPpr1/I= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.129400-8.000000 X-TMASE-Version: SMEX-14.0.0.3152-9.1.1006-23728.005 X-TM-SNTS-SMTP: 7A535968AABAC5A26AD9AAC417FAEEEE6836C2AA2F6B1234C28B08AD6DD310CB2000:8 X-MTK: N Content-Type: text/plain; charset="utf-8" Fix smatch static checker warning for vdec_h264_req_if.c. Leading to kernel crash when fb is NULL. Fixes: 06fa5f757dc5 ("media: mtk-vcodec: vdec: support stateless H.264 deco= ding") Signed-off-by: Yunfei Dong Reviewed-by: AngeloGioacchino Del Regno --- .../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_re= q_if.c index 73d5cef33b2a..1e1b32faac77 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, struc= t mtk_vcodec_mem *bs, return vpu_dec_reset(vpu); =20 fb =3D 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 =3D container_of(bs, struct mtk_video_dec_buf, bs_buffer); dst_buf_info =3D container_of(fb, struct mtk_video_dec_buf, frame_buffer); =20 - y_fb_dma =3D fb ? (u64)fb->base_y.dma_addr : 0; - c_fb_dma =3D fb ? (u64)fb->base_c.dma_addr : 0; + y_fb_dma =3D fb->base_y.dma_addr; + c_fb_dma =3D fb->base_c.dma_addr; =20 mtk_vdec_debug(inst->ctx, "+ [%d] FB y_dma=3D%llx c_dma=3D%llx va=3D%p", inst->num_nalu, y_fb_dma, c_fb_dma, fb); --=20 2.18.0