From patchwork Thu Jan 16 23:18:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECA1AC33CAF for ; Thu, 16 Jan 2020 23:36:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB5162072E for ; Thu, 16 Jan 2020 23:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217811; bh=f4TxQLy3Mhny7mtPzUFHT8lgsurK/XC2ANZvQ3SRims=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CbMdzTCRIJoQYdm4gG3x53VBV6lYqIH8wSgLCASBhyZmcRR1YA+Jf8iKDTCNbPouB UFqE//+zhCCGm+C/bn73pIgbueLzmjF7xbseBFF97jT7BNmFi/99b0dHSUu1u3mxl1 NgB3Q4Pmri2wZIVeATzbkNgzjgToOLmYLutlkuis= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403920AbgAPXb2 (ORCPT ); Thu, 16 Jan 2020 18:31:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:37546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404103AbgAPXaf (ORCPT ); Thu, 16 Jan 2020 18:30:35 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E639206D9; Thu, 16 Jan 2020 23:30:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579217434; bh=f4TxQLy3Mhny7mtPzUFHT8lgsurK/XC2ANZvQ3SRims=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lI72m9lq7UBDVaqMJiRL0GB44XW3WLVhOp5eateLFSofSDq8NGl0f0B4t4qA42HFd tpn3XIAOrWtL7MUO0ClQvKxjhd0aPJl/OMfc6mCuJYENyPp0P6VDNTk59Ki9dd7XyS eEOV5gXND+7SdpScS7rblRFim4d+8OVXzGnK8Iyo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Barabash , Dave Jiang , Vinod Koul , Sasha Levin Subject: [PATCH 4.19 81/84] ioat: ioat_alloc_ring() failure handling. Date: Fri, 17 Jan 2020 00:18:55 +0100 Message-Id: <20200116231722.980630735@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200116231713.087649517@linuxfoundation.org> References: <20200116231713.087649517@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alexander.Barabash@dell.com [ Upstream commit b0b5ce1010ffc50015eaec72b0028aaae3f526bb ] If dma_alloc_coherent() returns NULL in ioat_alloc_ring(), ring allocation must not proceed. Until now, if the first call to dma_alloc_coherent() in ioat_alloc_ring() returned NULL, the processing could proceed, failing with NULL-pointer dereferencing further down the line. Signed-off-by: Alexander Barabash Acked-by: Dave Jiang Link: https://lore.kernel.org/r/75e9c0e84c3345d693c606c64f8b9ab5@x13pwhopdag1307.AMER.DELL.COM Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ioat/dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 23fb2fa04000..b94cece58b98 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -388,10 +388,11 @@ ioat_alloc_ring(struct dma_chan *c, int order, gfp_t flags) descs->virt = dma_alloc_coherent(to_dev(ioat_chan), SZ_2M, &descs->hw, flags); - if (!descs->virt && (i > 0)) { + if (!descs->virt) { int idx; for (idx = 0; idx < i; idx++) { + descs = &ioat_chan->descs[idx]; dma_free_coherent(to_dev(ioat_chan), SZ_2M, descs->virt, descs->hw); descs->virt = NULL;