Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760574AbcLAQqT (ORCPT ); Thu, 1 Dec 2016 11:46:19 -0500 Received: from mga09.intel.com ([134.134.136.24]:48013 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759627AbcLAQqR (ORCPT ); Thu, 1 Dec 2016 11:46:17 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,282,1477983600"; d="scan'208";a="1066707550" Subject: Re: [PATCH 1/1] dma: ioat: set error code on failures To: Pan Bian , "Williams, Dan J" , "Koul, Vinod" , Julia Lawall References: <1480576212-26518-1-git-send-email-bianpan2016@163.com> Cc: "dmaengine@vger.kernel.org" , "linux-kernel@vger.kernel.org" From: Dave Jiang Message-ID: Date: Thu, 1 Dec 2016 09:46:16 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1480576212-26518-1-git-send-email-bianpan2016@163.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1291 Lines: 36 On 12/01/2016 12:10 AM, Pan Bian wrote: > Fix bug https://bugzilla.kernel.org/show_bug.cgi?id=188591. In function > ioat_dma_self_test(), when the calls to dma_mapping_error() fails, the > value of return variable err is 0 (indicates no error). As a result, the > return value may be inconsistent with the execution status. This patch > fixes the bug by assigning -ENOMEM to err on the error path. > > Signed-off-by: Pan Bian Acked-by: Dave Jiang > --- > drivers/dma/ioat/init.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c > index 015f711..32383ef 100644 > --- a/drivers/dma/ioat/init.c > +++ b/drivers/dma/ioat/init.c > @@ -340,11 +340,13 @@ static int ioat_dma_self_test(struct ioatdma_device *ioat_dma) > dma_src = dma_map_single(dev, src, IOAT_TEST_SIZE, DMA_TO_DEVICE); > if (dma_mapping_error(dev, dma_src)) { > dev_err(dev, "mapping src buffer failed\n"); > + err = -ENOMEM; > goto free_resources; > } > dma_dest = dma_map_single(dev, dest, IOAT_TEST_SIZE, DMA_FROM_DEVICE); > if (dma_mapping_error(dev, dma_dest)) { > dev_err(dev, "mapping dest buffer failed\n"); > + err = -ENOMEM; > goto unmap_src; > } > flags = DMA_PREP_INTERRUPT; >