dmaengine: fsl-edma: fix potential NULL pointer dereference in fsl_edma_tx_status()
| Message ID | 20221026101841.35305-1-acherniakov@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 l7csp178200wru;
Wed, 26 Oct 2022 03:36:05 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM7bUsvElqCHhj1GPvYO+EzhfwMMci/GP+NzlT3M56m8yWpWF640fuuhoZ41SVC+MQWIRRaZ
X-Received: by 2002:a05:6a02:186:b0:431:25fb:f1fe with SMTP id
bj6-20020a056a02018600b0043125fbf1femr37827101pgb.130.1666780565563;
Wed, 26 Oct 2022 03:36:05 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1666780565; cv=none;
d=google.com; s=arc-20160816;
b=tUadWz5F7Hsjbc4MnuN/rBhzo4AhBG4WC4Wx74+RdD3IUurvvbKQ5/wR2Y/hguNflg
QeSJTWZpAlIJCoBOAVq47pMe9g/R33NYLPpB288BFAeiKylfA/i17V6vg9Hbt/3HzwvG
i7CtJktGz5Pce1r+mkS+HtMbgEM79ncblo/y89NXBlvuhyDm/2flt4h3Vsge2MTdGGTO
x+Kn7gvuiPfVrYm8EFn0p9XMlxc3sKF4w47YqRjaOh2Fg2RgcuZsJ7NCtlCc9CaHOhCS
UQbZdM59T6taRMd5cqlCuOpedTXHgZqhDELIGON+v23/0mWt4LDAlqfpFPIpw7hxbwEk
t/EA==
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
:message-id:date:subject:cc:to:from;
bh=3TUXP4QTk+YznkP7do94QPRJEc3U7VU3egWnJ/h0WBY=;
b=NaR/1qbs2r2huhslFofYT6/SP84KCPlYgN/0Mv5zeB/mZ6ShV0Qc2J7tGMY22w/nb6
38dmoIKlkHZ2XiuNToId5DrkH/TJAoXi3WjKydSTijIuRD8weUn/60IezSzj3TYiKSLt
aeqwoeDcr361UpClV4/ZBlODjy24JKttBV7zBIM9Mlh7x9rmCa5tpZ+BUk79LK6z/WWm
bo5KB40e/C0yOxY+KoT5V8k/6twPl5umbugboB33zvM4TdFgU2NGwkG6rMREKUj/Nt6J
2SYd5aSD0nV44lfDQsdJKCZN4hd+iOs1mUiXAkSQEeU0vRUo9Lzv7zsmZwsp69jcdxaD
cIYA==
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
f11-20020a056a0022cb00b0056c7af51741si397523pfj.199.2022.10.26.03.35.51;
Wed, 26 Oct 2022 03:36:05 -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 S232884AbiJZKUj (ORCPT <rfc822;pwkd43@gmail.com> + 99 others);
Wed, 26 Oct 2022 06:20:39 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44960 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232489AbiJZKUi (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 26 Oct 2022 06:20:38 -0400
Received: from mail.astralinux.ru (mail.astralinux.ru [217.74.38.119])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19D1818372
for <linux-kernel@vger.kernel.org>;
Wed, 26 Oct 2022 03:20:34 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by mail.astralinux.ru (Postfix) with ESMTP id CE1551863E64;
Wed, 26 Oct 2022 13:20:30 +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 yaQttnF6dtwj; Wed, 26 Oct 2022 13:20:30 +0300 (MSK)
Received: from localhost (localhost [127.0.0.1])
by mail.astralinux.ru (Postfix) with ESMTP id 8443A1863E44;
Wed, 26 Oct 2022 13:20:30 +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 9cvu4zaxbI_T; Wed, 26 Oct 2022 13:20:30 +0300 (MSK)
Received: from work-laptop.astralinux.ru (unknown [10.177.20.36])
by mail.astralinux.ru (Postfix) with ESMTPSA id 213401863DE1;
Wed, 26 Oct 2022 13:20:30 +0300 (MSK)
From: Andrew Chernyakov <acherniakov@astralinux.ru>
To: Vinod Koul <vkoul@kernel.org>
Cc: Andrew Chernyakov <acherniakov@astralinux.ru>,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
lvc-project@linuxtesting.org
Subject: [PATCH] dmaengine: fsl-edma: fix potential NULL pointer dereference
in fsl_edma_tx_status()
Date: Wed, 26 Oct 2022 13:18:41 +0300
Message-Id: <20221026101841.35305-1-acherniakov@astralinux.ru>
X-Mailer: git-send-email 2.35.1
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?1747746098373161672?=
X-GMAIL-MSGID: =?utf-8?q?1747746098373161672?=
|
| Series |
dmaengine: fsl-edma: fix potential NULL pointer dereference in fsl_edma_tx_status()
|
|
Commit Message
Andrew Chernyakov
Oct. 26, 2022, 10:18 a.m. UTC
fsl_edma_desc_residue() dereferences fsl_chan->edesc, but it is checked
for NULL only in one of two places where fsl_edma_desc_residue() is
called from fsl_edma_tx_status().
Found by Linux Verification Center (linuxtesting.org) with SVACE.
Signed-off-by: Andrew Chernyakov <acherniakov@astralinux.ru>
---
drivers/dma/fsl-edma-common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 26-10-22, 13:18, Andrew Chernyakov wrote: > fsl_edma_desc_residue() dereferences fsl_chan->edesc, but it is checked > for NULL only in one of two places where fsl_edma_desc_residue() is > called from fsl_edma_tx_status(). Patch subject should be the change it introduces, pls revise > > Found by Linux Verification Center (linuxtesting.org) with SVACE. > > Signed-off-by: Andrew Chernyakov <acherniakov@astralinux.ru> > --- > drivers/dma/fsl-edma-common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c > index a06a1575a2a5..fb712d85d556 100644 > --- a/drivers/dma/fsl-edma-common.c > +++ b/drivers/dma/fsl-edma-common.c > @@ -330,7 +330,7 @@ enum dma_status fsl_edma_tx_status(struct dma_chan *chan, > if (fsl_chan->edesc && cookie == fsl_chan->edesc->vdesc.tx.cookie) > txstate->residue = > fsl_edma_desc_residue(fsl_chan, vdesc, true); > - else if (vdesc) > + else if (fsl_chan->edesc && vdesc) > txstate->residue = > fsl_edma_desc_residue(fsl_chan, vdesc, false); > else > -- > 2.35.1
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index a06a1575a2a5..fb712d85d556 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c @@ -330,7 +330,7 @@ enum dma_status fsl_edma_tx_status(struct dma_chan *chan, if (fsl_chan->edesc && cookie == fsl_chan->edesc->vdesc.tx.cookie) txstate->residue = fsl_edma_desc_residue(fsl_chan, vdesc, true); - else if (vdesc) + else if (fsl_chan->edesc && vdesc) txstate->residue = fsl_edma_desc_residue(fsl_chan, vdesc, false); else