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: [4.15,085/168] EDAC, mv64x60: Fix an error handling path From: Greg Kroah-Hartman Message-Id: <20180410212803.880324905@linuxfoundation.org> Date: Wed, 11 Apr 2018 00:23:47 +0200 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , linux-edac , Borislav Petkov , Sasha Levin List-ID: NC4xNS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBDaHJpc3RvcGhl IEpBSUxMRVQgPGNocmlzdG9waGUuamFpbGxldEB3YW5hZG9vLmZyPgoKClsgVXBzdHJlYW0gY29t bWl0IDY4ZmEyNGY5MTIxYzA0ZWYxNDZiNTE1OGY1MzhjOGIzMmYyODViZTUgXQoKV2Ugc2hvdWxk IG5vdCBjYWxsIGVkYWNfbWNfZGVsX21jKCkgaWYgYSBjb3JyZXNwb25kaW5nIGNhbGwgdG8KZWRh Y19tY19hZGRfbWMoKSBoYXMgbm90IGJlZW4gcGVyZm9ybWVkIHlldC4KClNvIGhlcmUsIHdlIHNo b3VsZCBnbyB0byBlcnIgaW5zdGVhZCBvZiBlcnIyIHRvIGJyYW5jaCBhdCB0aGUgcmlnaHQKcGxh Y2Ugb2YgdGhlIGVycm9yIGhhbmRsaW5nIHBhdGguCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RvcGhl IEpBSUxMRVQgPGNocmlzdG9waGUuamFpbGxldEB3YW5hZG9vLmZyPgpDYzogbGludXgtZWRhYyA8 bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+Ckxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcv ci8yMDE4MDEwNzIwNTQwMC4xNDA2OC0xLWNocmlzdG9waGUuamFpbGxldEB3YW5hZG9vLmZyClNp Z25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTog U2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZpbkBtaWNyb3NvZnQuY29tPgpTaWduZWQtb2ZmLWJ5 OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGRy aXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYyB8ICAgIDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGlu c2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKCgotLQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoaXMg bGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4KdGhlIGJvZHkg b2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBtYWpvcmRvbW8g aW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5odG1sCgotLS0g YS9kcml2ZXJzL2VkYWMvbXY2NHg2MF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL212NjR4NjBf ZWRhYy5jCkBAIC03NTgsNyArNzU4LDcgQEAgc3RhdGljIGludCBtdjY0eDYwX21jX2Vycl9wcm9i ZShzdHJ1Y3QgcAogCQkvKiBOb24tRUNDIFJBTT8gKi8KIAkJcHJpbnRrKEtFUk5fV0FSTklORyAi JXM6IE5vIEVDQyBESU1NcyBkaXNjb3ZlcmVkXG4iLCBfX2Z1bmNfXyk7CiAJCXJlcyA9IC1FTk9E RVY7Ci0JCWdvdG8gZXJyMjsKKwkJZ290byBlcnI7CiAJfQogCiAJZWRhY19kYmcoMywgImluaXQg bWNpXG4iKTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4/kIdXEFJATI9/j4FkwP2zUTcv+L6/2Ck3X5G2AH3MQoYbWiO0Cnk7kExhj4pAhvi1gMufl ARC-Seal: i=1; a=rsa-sha256; t=1523399377; cv=none; d=google.com; s=arc-20160816; b=EmdjxRhHwSbWzR6z75Dj/9nSfgzBPQJE00iUNsB904hPIjrdwiQ1JBVqbQVPvD9d9v 3dyIVtJpLFg5A95yJ55V01Z5PGVSgdUWqJPiLk4GPeC9Lb6QZBHOI+T7Co4OWBVskYvB HI706Wj1iHHJmltXuXnKAmvN8CeYwjTn/L8ZHM9iCLhe+T05pxg7I4ieafsl8djhbru2 ZnW7Zag2+3DKWCm233mDeyKnY1PO8HFv+aMI6hF2L3bcMWp2k5BG20XzvIOJ4Kcpi2fn yyTzGSIAVg4fF0aWMTUq2amJ8oxQLmm98XrYIN97Wa/JJlYEr7CUcAmfiOJYurE4uTfu QHMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=GPV9gNGXYoYQt682c9qExkSZIqGzn8tootpIHD5bn/o=; b=y/BnnRkBoR6h6OLLRb7oDx1FQo7LiacTLxTUc2972JoNtO44XV+AoihhXFN9ShnkW8 MJEN+fniaGl2e8ldIoRXKkTtjNPeD/8NZED672G7uXJWpumfuJ6OjNZSAfihMu2Eslar aR1l2pHBPq5K2/7/xdFQnmvJqCcQ8LoCgDqVBiLrzt7I2jhkfdVRt6+GctDEK39SRTlz ZP8Cj8ngQC/WdjbxSX/vU5zVskPTd3357il2iHQlJ/DVvu3akz+hTV9TG6by2HPmKqDu pt7ztfj04QXQ5Df3YCuPzyjIQTm1b81yS51ITHL92rk37kbN0wMvc/aQyC/f60qEZ0fh fXsw== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , linux-edac , Borislav Petkov , Sasha Levin Subject: [PATCH 4.15 085/168] EDAC, mv64x60: Fix an error handling path Date: Wed, 11 Apr 2018 00:23:47 +0200 Message-Id: <20180410212803.880324905@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180410212800.144079021@linuxfoundation.org> References: <20180410212800.144079021@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1597400025524274247?= X-GMAIL-MSGID: =?utf-8?q?1597400025524274247?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ 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@wanadoo.fr Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/mv64x60_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c @@ -758,7 +758,7 @@ static int mv64x60_mc_err_probe(struct p /* Non-ECC RAM? */ printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__); res = -ENODEV; - goto err2; + goto err; } edac_dbg(3, "init mci\n");