From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3293580-1521478517-2-16227788421528332604 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.25, 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='CN', 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=1521478517; b=Xhk4qKFPolyUh2rHsWjFuEMohrL+6ab2FOr5sE6Cd/dqnmD L3sFkbW7l2yBhk61IZXyLY/2KlZRR3v82We7zWlO6lI/QhsiG8WQ7K7STbEZaL0f +EVkII2RYFBa16RskpO69ZmUCxrZ9LlVI+aq5w8Mv5xFYM96FMkGto8wkA7qiG0X YjN/8AbN+9A2kK/FZylOKaJlmpURiItN2aMzyWqJMgW2mh/g+O+1dhxyskguS9At /tKvYEw2JO7I8ng112LI9vYTq7cUoiUEZjgbgfLyoIBb/4B/L+cFXSGLXco20klL FvgMQjK3bBvZTn3EX+bIxmwHvWUandK9HV9qLcA== 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=1521478517; bh=gjzj1M nv64Bp8Hs4dKjLXmCuVUez5ixwuz+FWFMdu5M=; b=a8xmHAhbygW5kqhAmPGTWo SHl1yG7aAT3oTmSVMaXZWxXxJflNB6SpPSFg+3HqwDcw1bTxYywoCjxMUPofxBJl klr5UFazDspZMqjXgKgXKmgPOfar0d2be7jDGori91x/lismJ/APHHDre5I4VMbe HQxo5q8FeJKhTCq2KEgCpdkYjztPSrrpx1W24BdCil/U86b/zVPCX+AYEinPfFnG NbcU9hh5awys4EeAxl9Z38tTQtdEuRALLEjXQlhQOVXlWcwxfHHb7Ymxznwb+s2A jZ+6myqVIb4C2BmaFiYJ1KVOwSLFvDopNn3MwLXk6sAdms5zACmadxCinnw+g0wA == 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=Tu6RhxiA 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-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdelgeculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeejvdeltdenucevlhhushhtvghrufhiiigvpedvud; 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=Tu6RhxiA 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-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdelgeculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppedvtdelrddufedvrddukedtrdeijedphedvrdduieekrdehgedrvdehvddpfhgvkedtmeemfegulegsmeejlegvjeemleegvggsmeehugeivdenucfrrghrrghmpehinhgvthepvddtledrudefvddrudektddrieejpdhhvghlohepvhhgvghrrdhkvghrnhgvlhdrohhrghdpmhgrihhlfhhrohhmpeeoshhtrggslhgvqdhofihnvghrsehvghgvrhdrkhgvrhhnvghlrdhorhhgqecuuefqffgjpeekuefkvffokffogfcuuffkkgfgpeejvdeltdenucevlhhushhtvghrufhiiigvpedvud; 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 S935058AbeCSQyQ (ORCPT ); Mon, 19 Mar 2018 12:54:16 -0400 Received: from mail-sn1nam01on0121.outbound.protection.outlook.com ([104.47.32.121]:24704 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933452AbeCSQLn (ORCPT ); Mon, 19 Mar 2018 12:11:43 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Christophe JAILLET , linux-edac , Borislav Petkov , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 161/167] EDAC, mv64x60: Fix an error handling path Thread-Topic: [PATCH AUTOSEL for 4.4 161/167] EDAC, mv64x60: Fix an error handling path Thread-Index: AQHTv5yOZ0/WdxTvC0qtDuI12SJbZQ== Date: Mon, 19 Mar 2018 16:08:45 +0000 Message-ID: <20180319160513.16384-161-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-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;DM5PR2101MB0984;7:xAmgs0wkSTke0FDCC6ZWlS0BrD4wVt2UWUH5e716tm8O6e+1ZY9LVhnu34QEldXn+qXWgcsMIZK09AkXnsktsd4KlNqDTzWUSMNDs4uVYbbjl7XuAKaI2apAkWJnQHXOU0NDz5utN9wwJpYpGj8SpDRfPp1GisxU8a0An+tKbaD3suEjizwNzOkSXSF3zi4p6GjPPy7SiNYy/C+EWPyHZRmntB0z782jJGtCj9KjlivjpryhErAjYaeAfvN2FJU2;20:kq5b57OTqww5gvRuEFUsPYfjdWcwSg0BGC0EhDzKpKh2GGa0Iol9dwlr1ut19SdRuHEROwrwkwz52UunxjG0Ea2zOIqywwWuTXIqxH1eQk5P72kuLbB3/hzRJOrZniZe+9EbFlyV0W8PsGW4u8f3X2ENoW6iJ/g9DtO+qr0S78g= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8f32294a-79dc-4d20-eaa3-08d58db410ef x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: 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)(9452136761055)(155761271638844)(42068640409301); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB0984;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0984; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39860400002)(366004)(39380400002)(376002)(346002)(199004)(189003)(54906003)(14454004)(68736007)(10090500001)(5660300001)(6506007)(186003)(26005)(99286004)(6306002)(7736002)(305945005)(76176011)(316002)(22452003)(53936002)(59450400001)(102836004)(110136005)(2906002)(107886003)(86362001)(10290500003)(3280700002)(478600001)(3660700001)(72206003)(86612001)(6512007)(966005)(3846002)(66066001)(36756003)(97736004)(6116002)(6486002)(25786009)(6666003)(2950100002)(1076002)(4326008)(5250100002)(105586002)(2900100001)(2501003)(81166006)(8936002)(81156014)(6436002)(8676002)(106356001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0984;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: y6nBbsZRbFKefLxKqcLkfrmRQ+3OlxL5t1R1DSK25QP8kKN1glBiLT6gzQmhQ98OKx4bSvMQdb6IjbtX8R09+TfulIiTMti3GK1aJo37dQc6zO59bi/Yen6tMDlzfUak4/nazu8P0FVwYYkmTC5yzGHHDp6xF7Au+PktZB0WXu88gQTzORU2rYMMm3xiOXpwZfWwuvoSlyYAhoAMrwgDj5kVKE0FflfXqTl/pZsKhrujEYCOcMkPNlhRHcvJAcG/GNo+BszlmVuoaBzdg3ARjHcfV+nkLryIf9dDpsjsdIuEac6FPh5svqRnaTrqzwDLahXDMPGRGuWHaybqAtTzrA== 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: 8f32294a-79dc-4d20-eaa3-08d58db410ef X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:08:45.6495 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 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 68fa24f9121c04ef146b5158f538c8b32f285be5 ] We should not call edac_mc_del_mc() if a corresponding call to edac_mc_add_mc() has not been performed yet. So here, we should go to err instead of err2 to branch at the right place of the error handling path. Signed-off-by: Christophe JAILLET Cc: linux-edac Link: http://lkml.kernel.org/r/20180107205400.14068-1-christophe.jaillet@wa= nadoo.fr Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin --- drivers/edac/mv64x60_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index 0574e1bbe45c..3ce5609b4611 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c @@ -763,7 +763,7 @@ static int mv64x60_mc_err_probe(struct platform_device = *pdev) /* Non-ECC RAM? */ printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__); res =3D -ENODEV; - goto err2; + goto err; } =20 edac_dbg(3, "init mci\n"); --=20 2.14.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [AUTOSEL,for,4.4,161/167] EDAC, mv64x60: Fix an error handling path From: Sasha Levin Message-Id: <20180319160513.16384-161-alexander.levin@microsoft.com> Date: Mon, 19 Mar 2018 16:08:45 +0000 To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Cc: Christophe JAILLET , linux-edac , Borislav Petkov , Sasha Levin List-ID: RnJvbTogQ2hyaXN0b3BoZSBKQUlMTEVUIDxjaHJpc3RvcGhlLmphaWxsZXRAd2FuYWRvby5mcj4K ClsgVXBzdHJlYW0gY29tbWl0IDY4ZmEyNGY5MTIxYzA0ZWYxNDZiNTE1OGY1MzhjOGIzMmYyODVi ZTUgXQoKV2Ugc2hvdWxkIG5vdCBjYWxsIGVkYWNfbWNfZGVsX21jKCkgaWYgYSBjb3JyZXNwb25k aW5nIGNhbGwgdG8KZWRhY19tY19hZGRfbWMoKSBoYXMgbm90IGJlZW4gcGVyZm9ybWVkIHlldC4K ClNvIGhlcmUsIHdlIHNob3VsZCBnbyB0byBlcnIgaW5zdGVhZCBvZiBlcnIyIHRvIGJyYW5jaCBh dCB0aGUgcmlnaHQKcGxhY2Ugb2YgdGhlIGVycm9yIGhhbmRsaW5nIHBhdGguCgpTaWduZWQtb2Zm LWJ5OiBDaHJpc3RvcGhlIEpBSUxMRVQgPGNocmlzdG9waGUuamFpbGxldEB3YW5hZG9vLmZyPgpD YzogbGludXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+Ckxpbms6IGh0dHA6Ly9s a21sLmtlcm5lbC5vcmcvci8yMDE4MDEwNzIwNTQwMC4xNDA2OC0xLWNocmlzdG9waGUuamFpbGxl dEB3YW5hZG9vLmZyClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4K U2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZpbkBtaWNyb3NvZnQuY29t PgotLS0KIGRyaXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2Vk LCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZWRh Yy9tdjY0eDYwX2VkYWMuYyBiL2RyaXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYwppbmRleCAwNTc0 ZTFiYmU0NWMuLjNjZTU2MDliNDYxMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9lZGFjL212NjR4NjBf ZWRhYy5jCisrKyBiL2RyaXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYwpAQCAtNzYzLDcgKzc2Myw3 IEBAIHN0YXRpYyBpbnQgbXY2NHg2MF9tY19lcnJfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldikKIAkJLyogTm9uLUVDQyBSQU0/ICovCiAJCXByaW50ayhLRVJOX1dBUk5JTkcgIiVz OiBObyBFQ0MgRElNTXMgZGlzY292ZXJlZFxuIiwgX19mdW5jX18pOwogCQlyZXMgPSAtRU5PREVW OwotCQlnb3RvIGVycjI7CisJCWdvdG8gZXJyOwogCX0KIAogCWVkYWNfZGJnKDMsICJpbml0IG1j aVxuIik7Cg==