From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372483-1517179380-2-5748834070559293615 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES enda, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179379; b=SPOgIwsghafoJxx1bhxpiQX2IE2gxUm6h7+Lrwt35Bm0Pd1 /WRqc+RiLNOihsrf/JgPnYimNTgfymQ2bZAKTTLaFuPT2IDgpsdGYGv/f/Rrc2U3 OZz7KTNU2d6qrYOk7Xg93NX7tkW/WlTBCbkaiIrzcywVz2lEfW3pRQdQqDjtFDpa 4dEq+szfJnc0E9OKpWbwlja9YLEwwR1HxjzwoPKXviA9/FwzSFu2kHNBWtKPBv0X xtQNy+qN6f5L20d36csqxOibUSttmQ5iWLR0JZtoM7ogpxktp8b5jNSGMK4vigk+ 69E9/DxTLfZG+HnkSLy1Sq0azYbUW7nTGT1tx7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179379; bh=rBgixh T0LzijqHPvyEV/NO+vpgcsMspcJLHfcsVMNJI=; b=AVwqQxISa3gFSswkob9aI8 d/G1MNeYMzgQHCl2m6+xMsFBElvXYKAiFAQuioYRy3YSLW4OaCmtl00PPnYd9cvP 5/cf/HidKv8Nt4HhoYA+UxWNyPsp1NeX4bZDjTJ+xqYUtSvmfAN/nMFNZOwgUVt2 qqaA/D9TRbTLx66Kjs8Kn5rLCTulWHZQwKS71iImSGR2k35RsogmwD9CGLoY659n eaDx1fz2991MenA9E9G7wYkugfunjJGpPGKPrgef1WBYHUXNdtO9jC3sz8SjZJWx qmIvyeAGptN/tkivAE8EWmfX2Ft9T3FicGGpfPI2OaFPBnhtwQ/8ZWZS01zaXNqg == ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=IT/ZkEYS x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=IT/ZkEYS x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932545AbeA1Wmm (ORCPT ); Sun, 28 Jan 2018 17:42:42 -0500 Received: from mail-cys01nam02on0124.outbound.protection.outlook.com ([104.47.37.124]:11968 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753152AbeA1W3y (ORCPT ); Sun, 28 Jan 2018 17:29:54 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Christophe JAILLET , Vinod Koul , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 22/36] dmaengine: ioat: Fix error handling path Thread-Topic: [PATCH AUTOSEL for 4.4 22/36] dmaengine: ioat: Fix error handling path Thread-Index: AQHTmIdXyRZI1lVwzU+M9MlhoIJEgA== Date: Sun, 28 Jan 2018 22:28:38 +0000 Message-ID: <20180128222815.29479-22-alexander.levin@microsoft.com> References: <20180128222815.29479-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222815.29479-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1114;7:Tw6MLXbWFUA577zaOLTGywzIMF3Umy5z2FThY+4CDpW/m7sXXGvc7YHiPMlItmsrXCNXFp9qsgQ0sd0BOVXKu5VRu/XNaGBuhR6433DFvc4mcVYVxDHnhAbwfw4pfy+qbwWJ//PFcfstUiqsn2Z+Jpph9hlEvEAZHM243dkgwyZX+cbTpM01427nRkZ1q4d1r8pjOBQaxHzbCUXEoNMxz70DADtqNPMmOConmxhTwXvNg2m1MHjTqU+TBi7dVhPY x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2a103b60-263f-4fc7-5baf-08d5669ea549 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1114; x-ms-traffictypediagnostic: MW2PR2101MB1114: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(155761271638844)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011);SRVR:MW2PR2101MB1114;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1114; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(376002)(396003)(39380400002)(39860400002)(346002)(366004)(189003)(199004)(305945005)(186003)(110136005)(26005)(81156014)(7736002)(8936002)(6506007)(102836004)(81166006)(6116002)(3846002)(316002)(1076002)(6486002)(6436002)(105586002)(22452003)(72206003)(3660700001)(2950100002)(14454004)(107886003)(6666003)(59450400001)(10290500003)(99286004)(68736007)(2906002)(97736004)(478600001)(3280700002)(76176011)(8676002)(54906003)(86612001)(10090500001)(36756003)(86362001)(2900100001)(5660300001)(25786009)(4326008)(5250100002)(6512007)(53936002)(106356001)(2501003)(66066001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1114;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: gU8cnAkWJMA+inqsMhxymzRL0ATa3FM6tS1xwh/c1ObhKhPhAFoOrKWerAIvODls82hAmGsSgYHrP2BQKrU/BQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2a103b60-263f-4fc7-5baf-08d5669ea549 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:28:38.7487 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1114 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Christophe JAILLET [ Upstream commit 5c9afbda911ce20b3f2181d1e440a0222e1027dd ] If the last test in 'ioat_dma_self_test()' fails, we must release all the allocated resources and not just part of them. Signed-off-by: Christophe JAILLET Acked-by: Dave Jiang Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ioat/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c index abb75ebd65ea..ac8c28968422 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -395,7 +395,7 @@ static int ioat_dma_self_test(struct ioatdma_device *io= at_dma) if (memcmp(src, dest, IOAT_TEST_SIZE)) { dev_err(dev, "Self-test copy failed compare, disabling\n"); err =3D -ENODEV; - goto free_resources; + goto unmap_dma; } =20 unmap_dma: --=20 2.11.0