[5.10,1/1] vdec_vp9_if: add check for NULL for vsi->frm_bufs[vsi->new_fb_idx].buf.fb in vp9_swap_frm_bufs
| Message ID | 20221028100539.30925-2-abelova@astralinux.ru |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp742154wru;
Fri, 28 Oct 2022 03:29:53 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM6AfDU59hSV5ID5wRwEe1XwwomY7KddH//SsLBPQVxtoSTdCFnwxcptCToZIfnjCzZ2kWmC
X-Received: by 2002:a63:da4f:0:b0:43f:6af:74ed with SMTP id
l15-20020a63da4f000000b0043f06af74edmr47013402pgj.290.1666952993632;
Fri, 28 Oct 2022 03:29:53 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666952993; cv=none;
d=google.com; s=arc-20160816;
b=KEcUZ+F1W+kymsnl9opJMhUHzzh+2z1WYh7WW4HK8V4l+ivrsDpFAiVBaO5k2ANtII
LbqW8pmoR4iKWvqCb8KYEZEl0l5hlG/Qzob1Jr7t8S8WHWIjjwR3AO/6wMxUUt0Tqg7f
M0qzg87RnON0G7D8nTavX7MbgVjJXRhgDWJ2ohiXVGsliWjm0w3bWExdTTfDQKn8+bw5
NI5eYLn/2u4+V1K2SsMrARk75G/Pss6ynXfROp+W7pgfGMM3EghHYBzXcAijSzR4QEBG
0sMcH5z1V1l1D2xB3e/rnJRdYNRECbcOHKuXamiiUlsM6qaDo95CVUtqqzM7D52GxtEr
i1bA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from;
bh=zwzLdWoWFgq62O5OUUPFj6Ag8jaRzLM+v7K+j93cq9Q=;
b=Y7heRSbJARU+Oinrk69euCdKPPuUJDk/Vyc4VqTwXYd137q0ngwz5Akqp3eFLAfSIi
AjSXL6gVN6WxX1vvhGAOJlC8papPV+wLb2f1LGJ9zonTCirGq7xI4SYy9O3SwjIQ4vIu
FdjzUiNdcmjYfxTr8MqO6WbYj1FIcjjq8PiPaUdQhVgmRKbB4XUTuBFATMPi1nQH1bpg
HBwBzwGnCLd93g6b6cs9P7jym57wZ+U+t1LDFKctCi7f+VQdXSWSAjMGeYQy8KvF00vH
ltxz81N8w3A2ajTg6O1r4LNwxbqpiQZigT95CGH7kBPymvqo9Hfb4znDH2dW5x3iYn1i
RIVw==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
9-20020a630f49000000b0046f72960502si1105574pgp.420.2022.10.28.03.29.40;
Fri, 28 Oct 2022 03:29:53 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230035AbiJ1KPh (ORCPT <rfc822;chrisfriedt@gmail.com>
+ 99 others); Fri, 28 Oct 2022 06:15:37 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36146 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229975AbiJ1KPc (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Fri, 28 Oct 2022 06:15:32 -0400
X-Greylist: delayed 577 seconds by postgrey-1.37 at lindbergh.monkeyblade.net;
Fri, 28 Oct 2022 03:15:28 PDT
Received: from mail.astralinux.ru (mail.astralinux.ru [217.74.38.119])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B5B45419E;
Fri, 28 Oct 2022 03:15:26 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by mail.astralinux.ru (Postfix) with ESMTP id D5A801864518;
Fri, 28 Oct 2022 13:05:55 +0300 (MSK)
Received: from mail.astralinux.ru ([127.0.0.1])
by localhost (rbta-msk-vsrv-mail01.astralinux.ru [127.0.0.1])
(amavisd-new, port 10032)
with ESMTP id RQ0YjnkqfdBW; Fri, 28 Oct 2022 13:05:55 +0300 (MSK)
Received: from localhost (localhost [127.0.0.1])
by mail.astralinux.ru (Postfix) with ESMTP id 7E2381864579;
Fri, 28 Oct 2022 13:05:55 +0300 (MSK)
X-Virus-Scanned: amavisd-new at astralinux.ru
Received: from mail.astralinux.ru ([127.0.0.1])
by localhost (rbta-msk-vsrv-mail01.astralinux.ru [127.0.0.1])
(amavisd-new, port 10026)
with ESMTP id PqBdEedcLvs2; Fri, 28 Oct 2022 13:05:55 +0300 (MSK)
Received: from rbta-msk-lt-106062.astralinux.ru (unknown [10.177.20.20])
by mail.astralinux.ru (Postfix) with ESMTPSA id DF1611864315;
Fri, 28 Oct 2022 13:05:54 +0300 (MSK)
From: Anastasia Belova <abelova@astralinux.ru>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Anastasia Belova <abelova@astralinux.ru>,
Tiffany Lin <tiffany.lin@mediatek.com>,
Andrew-CT Chen <andrew-ct.chen@mediatek.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
lvc-project@linuxtesting.org
Subject: [PATCH 5.10 1/1] vdec_vp9_if: add check for NULL for
vsi->frm_bufs[vsi->new_fb_idx].buf.fb in vp9_swap_frm_bufs
Date: Fri, 28 Oct 2022 13:05:39 +0300
Message-Id: <20221028100539.30925-2-abelova@astralinux.ru>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20221028100539.30925-1-abelova@astralinux.ru>
References: <20221028100539.30925-1-abelova@astralinux.ru>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE,
SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1747926902305817309?=
X-GMAIL-MSGID: =?utf-8?q?1747926902305817309?=
|
| Series |
vdec_vp9_if: add check for NULL for vsi->frm_bufs[vsi->new_fb_idx].buf.fb in vp9_swap_frm_bufs
|
|
Commit Message
Anastasia Belova
Oct. 28, 2022, 10:05 a.m. UTC
If vsi->frm_bufs[vsi->new_fb_idx].buf.fb == NULL while cleaning
fb_free_list NULL-pointer is dereferenced.
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by: Anastasia Belova <abelova@astralinux.ru>
---
drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Fri, Oct 28, 2022 at 01:05:39PM +0300, Anastasia Belova wrote: > If vsi->frm_bufs[vsi->new_fb_idx].buf.fb == NULL while cleaning > fb_free_list NULL-pointer is dereferenced. > > Found by Linux Verification Center (linuxtesting.org) with SVACE. > > Signed-off-by: Anastasia Belova <abelova@astralinux.ru> > --- > drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c > index d9880210b2ab..dea056689b48 100644 > --- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c > +++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c > @@ -512,7 +512,7 @@ static void vp9_swap_frm_bufs(struct vdec_vp9_inst *inst) > * clean fb_free_list > */ > if (vsi->frm_bufs[vsi->new_fb_idx].ref_cnt == 0) { > - if (!vp9_is_sf_ref_fb( > + if (vsi->frm_bufs[vsi->new_fb_idx].buf.fb != NULL && !vp9_is_sf_ref_fb( > inst, vsi->frm_bufs[vsi->new_fb_idx].buf.fb)) { > struct vdec_fb *fb; > > -- > 2.30.2 > <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c index d9880210b2ab..dea056689b48 100644 --- a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +++ b/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c @@ -512,7 +512,7 @@ static void vp9_swap_frm_bufs(struct vdec_vp9_inst *inst) * clean fb_free_list */ if (vsi->frm_bufs[vsi->new_fb_idx].ref_cnt == 0) { - if (!vp9_is_sf_ref_fb( + if (vsi->frm_bufs[vsi->new_fb_idx].buf.fb != NULL && !vp9_is_sf_ref_fb( inst, vsi->frm_bufs[vsi->new_fb_idx].buf.fb)) { struct vdec_fb *fb;