From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517180596-2-5465667913285737413 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 en, 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=1517180595; b=Egd/LOjDWZ+HVPKIOiQl50MGcJ/h7nxU2lR5JOJf/KCvCKs nTZHs+6l/BPk56T2mHy/VCX+Xv+YEc7kBuAMLB5zisTshqwaDgIV5aFW70cw2IAM Yszrxz8urxc68bN/yfJ6CI3CZRUuc7sbgrfiGY59cNKEA/d9OEmEEE26tZR/qxse RUxfm1lPKfseWtmn8K2p6jT4HdhxD9stEgJ+Fr/CzMKukUSdSY++urRK8dBoulYz WWiQgcPpVrv0OKfCS2etmvYn8Hy7XmfBB5ARPJhdQyWsr8iHRDuGhxHWbB6p0NPk LGW+D+bSPtADXLnCQicffjBEkj38HW1mJcbcdaw== 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=1517180595; bh=Odt5He XDA+uioHj3JIgQfzIqvWLIfCXLWl8Kc9STRCI=; b=cNOZzEGTic/ZNGupSOFmNB R8tkkGD90AGql2D+lCD5NPRARnMxmbetsxl7QJ80JPzVbEODL1BWnmyNp7tPJ7rO Mee3AF7jViTZIjHPKNSLatRbomaidh9rQMT+qJYWYDvMZ/VWm2ToFBVmwObhSHf9 JfBbpCqfz0dj4Xl2j6ur30ujCSItQzylkS0I9gdRBdIeWs2ZKsGNrzWmbshRlIPk YC/HMhpb6sQlD6YY+gQg96x8K3a8/zu0tZHE/3aSmrwe+bxMH2L5KyeSt34aZMO/ OPZKk5ObJdnDV/T8+4oLvrMagpUemxzbHkz4nx+GntVGkc2iWaADP05thmCMHANQ == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=KfRB9OWY 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=KfRB9OWY 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 S933194AbeA1XDA (ORCPT ); Sun, 28 Jan 2018 18:03:00 -0500 Received: from mail-bn3nam01on0128.outbound.protection.outlook.com ([104.47.33.128]:55858 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753488AbeA1W1o (ORCPT ); Sun, 28 Jan 2018 17:27:44 -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.14 074/100] dmaengine: ioat: Fix error handling path Thread-Topic: [PATCH AUTOSEL for 4.14 074/100] dmaengine: ioat: Fix error handling path Thread-Index: AQHTmIcVzw5927Eo10KrnpA4GuTYtg== Date: Sun, 28 Jan 2018 22:26:47 +0000 Message-ID: <20180128222547.7398-74-alexander.levin@microsoft.com> References: <20180128222547.7398-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222547.7398-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;MW2PR2101MB1018;7:y7+7Iy2SYkzc3bLZeEtxZX4V0mhbLqGc8bJluMGWU6oe/VDZuTkSr8COHVZRN12Empw+TqJyEPIjg4VyiC4dxyZKHmm1V2+x1oEEaE1mRBep3ILyTwChiPAcGypInkhr/IblQu0+dc5YDUFAKjqylUhqo+xAZf+rUPSlG2FDSzKkGkK1DGzcyJowEmu3eQaQICxAt1hKoE8ROsLcswyNpb/yCM4otx87SQRCASMY/yjrfs8vfxut8k7PTy9D/bwm x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 2aaf1349-8a39-46b8-0bc0-08d5669e5668 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1018; x-ms-traffictypediagnostic: MW2PR2101MB1018: 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:MW2PR2101MB1018;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1018; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(39860400002)(366004)(346002)(376002)(199004)(189003)(53936002)(2501003)(6436002)(575784001)(86362001)(6486002)(5250100002)(26005)(102836004)(6512007)(59450400001)(76176011)(6116002)(2900100001)(3846002)(36756003)(305945005)(7736002)(316002)(3660700001)(22452003)(3280700002)(54906003)(110136005)(99286004)(186003)(97736004)(1076002)(86612001)(81166006)(6666003)(2906002)(106356001)(14454004)(66066001)(4326008)(68736007)(5660300001)(25786009)(8936002)(10290500003)(81156014)(72206003)(107886003)(10090500001)(478600001)(2950100002)(105586002)(8676002)(6506007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1018;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: HQ9AGx45GpQpR2Q2uIkxokBxhHdMFpSXCzBUAKUpUEsuYv/xl1MFyG3TFiBZjoCck0w1i7KBv3cw8QE7h9KZYQ== 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: 2aaf1349-8a39-46b8-0bc0-08d5669e5668 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:26:47.2744 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1018 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 93e006c3441d..854deb0da07c 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c @@ -390,7 +390,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