From patchwork Fri Apr 14 18:30:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Elfring X-Patchwork-Id: 13211909 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B916C77B71 for ; Fri, 14 Apr 2023 18:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Cc:References:To:From: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ApQwc1UvOYnuEgBXb0s/GUkKMtu50CVqVajSTdOteF8=; b=uXocIVWfTrQWMj ZRFwJrU3rmEgV1+11+V3yyVP5SRH3QJuyKcJmIyYvZAmrRNN5xmbehBNI7h6wpbvVroqn0ueiXw7f 0nZSwuO6uWE5VFOYBEYDVCqIkyzBs/4ejZzVgkky7lcOnS6imvcR/zcig0ShDBnQvWufzXphTqFty QyLYy5zXDgWChbOawEyEYNZ0HTYM05hcT38lGzgn71qY/sD+kGgWcZYktSuKdRJEXg6yoY7rcCWr4 tDGyHvAiHvjtRBABMNVw89wRguzfKpJFIGW1odI65J9vyct/VDochJ7b1/yTQAKBGaJLc8Kdb0KD/ kj0HiATVuWeI7BFhtTKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pnOCE-00AMov-1D; Fri, 14 Apr 2023 18:30:54 +0000 Received: from mout.web.de ([217.72.192.78]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pnOCA-00AMo2-2W; Fri, 14 Apr 2023 18:30:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1681497022; i=markus.elfring@web.de; bh=4THy5S1zSzl+WBFeDQSgq2WZGHTK5AmyAL0vwl6Ck5c=; h=X-UI-Sender-Class:Date:Subject:From:To:References:Cc:In-Reply-To; b=h622cmztAaAGVGdPYsd7j+2mcKuXgZm2NVYEiicB87AUVf/HDr/sYg6/CEwm9ucfM 6W6HOQ2U65h/bdmFxpdhbLI6YqsI9xosoYo62E9GX1qA/CwsKzDCLrkGFLBA8oNkyf 7xzjoVEYTfIDNP9E6jOd9Dc2wIHE6Vw/sRn6mzRQB0rnwX+EEohMdG+RYWQmKtlcT0 QjEWsZR9W9fbrE0tNa1osPcCuAl51YRJG3toABIhEZ8kYvrD2Vkn2UbBeSfp/5dlq/ TsiS34dxM3X+8w1z+BPhvkDzJqaO3GhZcy9m6naPT4Wl6nA6PsRmVUBDDeCh9TNJsq tycqO0RQMVXUA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.21] ([94.31.85.83]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MwjJo-1qY2U80Ehu-00ySyr; Fri, 14 Apr 2023 20:30:22 +0200 Message-ID: Date: Fri, 14 Apr 2023 20:30:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: [PATCH] media: mediatek: vcodec: Move a variable assignment behind condition checks in vdec_vp9_slice_single_decode() Content-Language: en-GB From: Markus Elfring To: kernel-janitors@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, Andrew-CT Chen , AngeloGioacchino Del Regno , Ezequiel Garcia , Guo Zhengkui , Hans Verkuil , Haowen Bai , Matthias Brugger , Mauro Carvalho Chehab , Mingjia Zhang , Tiffany Lin , Xiaoyong Lu , Yunfei Dong References: <40c60719-4bfe-b1a4-ead7-724b84637f55@web.de> <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> Cc: cocci@inria.fr, LKML In-Reply-To: <1a11455f-ab57-dce0-1677-6beb8492a257@web.de> X-Provags-ID: V03:K1:2Yx9WQLSLdMDVajG3OxtB2qMwsC6ueaycbkN30z2vYmJGnKf0F9 o6eB0KmGCQL7pz2RsLRFMm7I+/YbJlSUWNJkKwuotr+qmwsjFZw88uJSR1IbtlKqDbslrxu qM7HJxbvpcmRXvdkI/Png6qz/ujw8NPG5jt2MHLIRf4H3X59ROl6oZhzR2acSnvGwpyTfoX 1KaUC7TMvrBwS1pQk9i2w== UI-OutboundReport: notjunk:1;M01:P0:OAOICbMF1/w=;nFtDtiqPPaQNZHgMHXrS+LCw90r Zxo7ndExIT0qO4VqxPCfT42LW9RElUS2OReaQVG0DuQfSlZb1f29V8X4F+YiSi9oHtZ6Rm+py p638shBzq0vzN/KJ0bHPUMP6GPvEX4xZv5wUASglsfyZq/rdLdA3CvNw7MuMQUjLswQBLYTkO R79rMxjRhqiKlHLlEUrRHFhUYWhXzxw3CARfva1HM5wjcBVnqdpiTIIe0BRXlxpdxR7Ir6nWI lJd79sIXanFMF8rJ6dkzzvZCPw3lKmoHGqJfQ0MySE1sTLYeGp2TiBYr0GB2W3YlpWcmfvgQ1 ZVk0UMYUkydvdZXn5ZxiRQprKjfPNRZG0B5CubLjzWJh5UW6khF5i6x0kgaGzQ5pvbrLxYkjx Tr4jZ+tuPDOLRt/duIyE33/DyzFzz54EUxeZGAtwwcGH1P8hKPBkfPcZOA5NYEF8iIJmv35FP r8289+UH2gOlFiNolkT9bu7AJRQ7jAAbr9j/WhP3IBh+GgyHPPoUwZ9dp9h8Wbjgexq6kj2ki hc8D2A/xMZ76ekZFiOSUTX9EyvN9k3blwTbBIC1uHYKENBsYfiQ15kcnRZbND5O3rR2T/zaHx 6H8R0Vr0C0WT1iFJOzVbqsMOfCTUMf9+9Wl5NEgskp6yV9I1AXgevkFY1M9qxxo2rzL1ww/0B tYAXHyzCAehEkqAo16Lq1yT/xdjyDoL6S7vl3RyatJv9t9NEL58MStwk1IJ8ag/IyGfMXcN7z /vahBS1GrtsBx0GhUa864Tmrf/OOYvBb4wfK7EqEyyUx2rjuZ4pvFBFae0TizGamdjPkgKWpE 7S/DbJ3ZwWXxg7Sn8Y2DRzxcNvdLcx0xZ/tAnIvBofJ4VXkphecac5k84EWhW4Le/ReVpov6F wvMGx0M17ydClLHrU5hPXPu4omgFK/FA1Uv/2robQDdWir+atRGBWTsa0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230414_113051_298863_8A1862FE X-CRM114-Status: GOOD ( 10.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Date: Fri, 14 Apr 2023 20:07:01 +0200 The address of a data structure member was determined before a corresponding null pointer check in the implementation of the function “vdec_vp9_slice_single_decode”. Thus avoid the risk for undefined behaviour by moving the assignment for the variable “pfc” behind some condition checks. This issue was detected by using the Coccinelle software. Fixes: b0f407c19648ae9110c932c91d6e1b9381ec0aeb ("media: mediatek: vcodec: add vp9 decoder driver for mt8186") Signed-off-by: Markus Elfring Reviewed-by: AngeloGioacchino Del Regno --- .../media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.40.0 diff --git a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c index cf16cf2807f0..22b27f7b57bf 100644 --- a/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c +++ b/drivers/media/platform/mediatek/vcodec/vdec/vdec_vp9_req_lat_if.c @@ -1990,7 +1990,7 @@ static int vdec_vp9_slice_single_decode(void *h_vdec, struct mtk_vcodec_mem *bs, struct vdec_fb *fb, bool *res_chg) { struct vdec_vp9_slice_instance *instance = h_vdec; - struct vdec_vp9_slice_pfc *pfc = &instance->sc_pfc; + struct vdec_vp9_slice_pfc *pfc; struct vdec_vp9_slice_vsi *vsi; struct mtk_vcodec_ctx *ctx; int ret; @@ -2007,6 +2007,7 @@ static int vdec_vp9_slice_single_decode(void *h_vdec, struct mtk_vcodec_mem *bs, if (!fb) return -EBUSY; + pfc = &instance->sc_pfc; vsi = &pfc->vsi; ret = vdec_vp9_slice_setup_single(instance, bs, fb, pfc);