From patchwork Wed Mar 13 16:55:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 10851501 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2C15E14DE for ; Wed, 13 Mar 2019 16:56:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 160112887A for ; Wed, 13 Mar 2019 16:56:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09E072A073; Wed, 13 Mar 2019 16:56:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97D3029F4E for ; Wed, 13 Mar 2019 16:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726688AbfCMQzz (ORCPT ); Wed, 13 Mar 2019 12:55:55 -0400 Received: from mta-p7.oit.umn.edu ([134.84.196.207]:50640 "EHLO mta-p7.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726442AbfCMQzy (ORCPT ); Wed, 13 Mar 2019 12:55:54 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 76EF9A29 for ; Wed, 13 Mar 2019 16:55:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DiP5v-7aIO-p for ; Wed, 13 Mar 2019 11:55:52 -0500 (CDT) Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 4511DABC for ; Wed, 13 Mar 2019 11:55:52 -0500 (CDT) Received: by mail-io1-f71.google.com with SMTP id e1so1986993iod.23 for ; Wed, 13 Mar 2019 09:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=upm2Q86VVPu6zcT5F0Y1ZkrMnCzf1/YcQCvwWffDqY4=; b=fjBBCVWJ6SGRmNGThnwgtYsvamFxWPfSKFKZMZpPjJEjOEuM+AWt/bQQRsruo1fNDl DPBLutlz3QhAbe1s1o9nlSgMnGkSTBglAukh5UpQKLsqE+OX+qBg6/u61lro89uEwx4T 36+2ehxCQZUytmgYXWl/JybHf6TqOxaze2+Xi16BShlpb3BeSAXn3J/A0ydAa6alKXDV LtyQS2vG9cq9sm76u7EBYoX4n7mQgBkq6ZHJK6AqrEJwPPDl2g5CqObrMF/yWXhGBazp qwTHEkescDJkK8YXH5GluD+J4jkwv4pTGX9WHM6ZznMvFKw2A1BdagtDJFAXAEeH4iyq 5xXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=upm2Q86VVPu6zcT5F0Y1ZkrMnCzf1/YcQCvwWffDqY4=; b=N2xq2owRYR4GQMSN1YvfY9dU1cJMVfM/hBp1Dss4nPpTFFXWzmgphvptW8OubTg+Mv SwrgNwuduKjrzaQOl4AT5k+Ha4db5GejjWHnJRv5NZxEE6CYjTDBVNRiC11SV14Tg3nI yXyk5aJk9Yreb7lZGo8fTekB83w49fQjdMyYXAlia9X1FJNBvRMTysRsYeK07/tMs47j P6qb9XVxTiFdbJtO7ZJPRD3cEtNwu3puRoPzYLHdyvScp+8lGOgnWDMG0gLbotVeRF++ ztjo/EIPAvVq6KA/YuCGFxPYG6+OmxP53k4Wkp64QAsJLucMPS/qA8xXQjcDvZ2b1uqa F+5w== X-Gm-Message-State: APjAAAXgdepovjst6+vf6yMNMRrAMwkdUI//bYgWNfWOQhZlGu3byG3m lGJoC8Y6lQm0iHbi2e8W8LzJfbzue9GuChXf/tf03bioF0/xexbdja7yBRQjqOKyWfIwqA6NhCn +/nTP/vmw1sXDDFp5fMqvnw1h X-Received: by 2002:a24:1605:: with SMTP id a5mr2378474ita.89.1552496151886; Wed, 13 Mar 2019 09:55:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwAyM691gipaluBGG4UigtYI9JEjuIMmsRRWSrod/ejHoO+1Ur/GV3ny4utDJumv/RbKILgAQ== X-Received: by 2002:a24:1605:: with SMTP id a5mr2378461ita.89.1552496151627; Wed, 13 Mar 2019 09:55:51 -0700 (PDT) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id q17sm5554692ior.71.2019.03.13.09.55.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 09:55:50 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] spi : spi-topcliff-pch: Fix to handle empty DMA buffers Date: Wed, 13 Mar 2019 11:55:41 -0500 Message-Id: <20190313165541.22548-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pch_alloc_dma_buf allocated tx, rx DMA buffers which can fail. Further, these buffers are used without a check. The patch checks for these failures and sends the error upstream. Signed-off-by: Aditya Pakki --- drivers/spi/spi-topcliff-pch.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index fba3f180f233..8a5966963834 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c @@ -1299,18 +1299,27 @@ static void pch_free_dma_buf(struct pch_spi_board_data *board_dat, dma->rx_buf_virt, dma->rx_buf_dma); } -static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat, +static int pch_alloc_dma_buf(struct pch_spi_board_data *board_dat, struct pch_spi_data *data) { struct pch_spi_dma_ctrl *dma; + int ret; dma = &data->dma; + ret = 0; /* Get Consistent memory for Tx DMA */ dma->tx_buf_virt = dma_alloc_coherent(&board_dat->pdev->dev, PCH_BUF_SIZE, &dma->tx_buf_dma, GFP_KERNEL); + if (!dma->tx_buf_virt) + ret = -ENOMEM; + /* Get Consistent memory for Rx DMA */ dma->rx_buf_virt = dma_alloc_coherent(&board_dat->pdev->dev, PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL); + if (!dma->rx_buf_virt) + ret = -ENOMEM; + + return ret; } static int pch_spi_pd_probe(struct platform_device *plat_dev) @@ -1387,7 +1396,9 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev) if (use_dma) { dev_info(&plat_dev->dev, "Use DMA for data transfers\n"); - pch_alloc_dma_buf(board_dat, data); + ret = pch_alloc_dma_buf(board_dat, data); + if (ret) + goto err_spi_register_master; } ret = spi_register_master(master);