From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48zXBLREILxbzxucPUudw33pzXUPcMseArMijDRv1nhj+eqYQbo2wrJBRsPzn7lK9QiJNoQ ARC-Seal: i=1; a=rsa-sha256; t=1523473480; cv=none; d=google.com; s=arc-20160816; b=gGDx92kIaY0GZOehP7jWYl4LmCCUaHSAzCrffIuln9PHJFf6AE+liWoJkfuMbd9APr kKxGDimuepOzhc1xSS1CiAJ9w8Xsln4NCXMO5v86f+dk3vBFs32GtRpW/NPJ/eKCBmfg OjYuPh7+R0DFg3RUIxkDBjt2uOR1c2xk7K/CP03UQb3F/kkUILPGQsyDEuk6HTtoWb8w Lb5fbl2vyKd2WEyDslYmYOTCJQ8NpO+jazvdfPD5273NvNlzVpjsHvBW829f7Zbl7nOY yyV1OTpkWlVZX5gTyFQn99y467uHoKB981M1POtd6fdBGdiqqli6z6MwMYpTotn9IpZQ F9KQ== 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=c5mrnJ94P3NLeSTi4ZxayKKmkPFUvioEbhWSVFRkvj0=; b=Re5EXM626zN5U1iC05xXaUD1/BY1UtP9fw1tfatylLNkmtyrizevB+nicLprpKAJcE jk9acv/b8YvQn3zH0VANY9ZxS4Izgjo4xAlis85tMXRaMyNzzSXByKZszKfMrzrOVYjY GjKahwrEdd8uDsGdcrFcgu5CKXBkB8YrUoOp7hwW0/IG+cEXdCkpBW/FcxFg/pHk8ECw /nLygINo4uz5Xx99f7NoH5+wc9tk2sMfZEF+SCOpC2lijNn2uvTpv5ylzL9I6qYvJqZN FWg664zHf7V2NABT7SzNGL6OL8bhEeGyWLHFZRmGWRtWw5r4BbddndohXnq5IQl1/0SK ae+Q== 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.9 264/310] EDAC, mv64x60: Fix an error handling path Date: Wed, 11 Apr 2018 20:36:43 +0200 Message-Id: <20180411183634.020982805@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@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?1597476306178591836?= X-GMAIL-MSGID: =?utf-8?q?1597477728209581670?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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 @@ -759,7 +759,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"); 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.9,264/310] EDAC, mv64x60: Fix an error handling path From: Greg Kroah-Hartman Message-Id: <20180411183634.020982805@linuxfoundation.org> Date: Wed, 11 Apr 2018 20:36:43 +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: NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IENocmlzdG9waGUg SkFJTExFVCA8Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI+CgoKWyBVcHN0cmVhbSBjb21t aXQgNjhmYTI0ZjkxMjFjMDRlZjE0NmI1MTU4ZjUzOGM4YjMyZjI4NWJlNSBdCgpXZSBzaG91bGQg bm90IGNhbGwgZWRhY19tY19kZWxfbWMoKSBpZiBhIGNvcnJlc3BvbmRpbmcgY2FsbCB0bwplZGFj X21jX2FkZF9tYygpIGhhcyBub3QgYmVlbiBwZXJmb3JtZWQgeWV0LgoKU28gaGVyZSwgd2Ugc2hv dWxkIGdvIHRvIGVyciBpbnN0ZWFkIG9mIGVycjIgdG8gYnJhbmNoIGF0IHRoZSByaWdodApwbGFj ZSBvZiB0aGUgZXJyb3IgaGFuZGxpbmcgcGF0aC4KClNpZ25lZC1vZmYtYnk6IENocmlzdG9waGUg SkFJTExFVCA8Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI+CkNjOiBsaW51eC1lZGFjIDxs aW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KTGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9y LzIwMTgwMTA3MjA1NDAwLjE0MDY4LTEtY2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnIKU2ln bmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpTaWduZWQtb2ZmLWJ5OiBT YXNoYSBMZXZpbiA8YWxleGFuZGVyLmxldmluQG1pY3Jvc29mdC5jb20+ClNpZ25lZC1vZmYtYnk6 IEdyZWcgS3JvYWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+Ci0tLQogZHJp dmVycy9lZGFjL212NjR4NjBfZWRhYy5jIHwgICAgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5z ZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgoKCi0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBs aXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmliZSBsaW51eC1lZGFjIiBpbgp0aGUgYm9keSBv ZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBp bmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwKCi0tLSBh L2RyaXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvbXY2NHg2MF9l ZGFjLmMKQEAgLTc1OSw3ICs3NTksNyBAQCBzdGF0aWMgaW50IG12NjR4NjBfbWNfZXJyX3Byb2Jl KHN0cnVjdCBwCiAJCS8qIE5vbi1FQ0MgUkFNPyAqLwogCQlwcmludGsoS0VSTl9XQVJOSU5HICIl czogTm8gRUNDIERJTU1zIGRpc2NvdmVyZWRcbiIsIF9fZnVuY19fKTsKIAkJcmVzID0gLUVOT0RF VjsKLQkJZ290byBlcnIyOworCQlnb3RvIGVycjsKIAl9CiAKIAllZGFjX2RiZygzLCAiaW5pdCBt Y2lcbiIpOwo=