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: Patch "EDAC, mv64x60: Fix an error handling path" has been added to the 4.15-stable tree From: Greg Kroah-Hartman Message-Id: <1523266575121148@kroah.com> Date: Mon, 09 Apr 2018 11:36:15 +0200 To: christophe.jaillet@wanadoo.fr, alexander.levin@microsoft.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org List-ID: VGhpcyBpcyBhIG5vdGUgdG8gbGV0IHlvdSBrbm93IHRoYXQgSSd2ZSBqdXN0IGFkZGVkIHRoZSBw YXRjaCB0aXRsZWQKCiAgICBFREFDLCBtdjY0eDYwOiBGaXggYW4gZXJyb3IgaGFuZGxpbmcgcGF0 aAoKdG8gdGhlIDQuMTUtc3RhYmxlIHRyZWUgd2hpY2ggY2FuIGJlIGZvdW5kIGF0OgogICAgaHR0 cDovL3d3dy5rZXJuZWwub3JnL2dpdC8/cD1saW51eC9rZXJuZWwvZ2l0L3N0YWJsZS9zdGFibGUt cXVldWUuZ2l0O2E9c3VtbWFyeQoKVGhlIGZpbGVuYW1lIG9mIHRoZSBwYXRjaCBpczoKICAgICBl ZGFjLW12NjR4NjAtZml4LWFuLWVycm9yLWhhbmRsaW5nLXBhdGgucGF0Y2gKYW5kIGl0IGNhbiBi ZSBmb3VuZCBpbiB0aGUgcXVldWUtNC4xNSBzdWJkaXJlY3RvcnkuCgpJZiB5b3UsIG9yIGFueW9u ZSBlbHNlLCBmZWVscyBpdCBzaG91bGQgbm90IGJlIGFkZGVkIHRvIHRoZSBzdGFibGUgdHJlZSwK cGxlYXNlIGxldCA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4ga25vdyBhYm91dCBpdC4KCgpGcm9t IGZvb0BiYXogTW9uIEFwciAgOSAxMDoxNjozMiBDRVNUIDIwMTgKRnJvbTogQ2hyaXN0b3BoZSBK QUlMTEVUIDxjaHJpc3RvcGhlLmphaWxsZXRAd2FuYWRvby5mcj4KRGF0ZTogU3VuLCA3IEphbiAy MDE4IDIxOjU0OjAwICswMTAwClN1YmplY3Q6IEVEQUMsIG12NjR4NjA6IEZpeCBhbiBlcnJvciBo YW5kbGluZyBwYXRoCgpGcm9tOiBDaHJpc3RvcGhlIEpBSUxMRVQgPGNocmlzdG9waGUuamFpbGxl dEB3YW5hZG9vLmZyPgoKClsgVXBzdHJlYW0gY29tbWl0IDY4ZmEyNGY5MTIxYzA0ZWYxNDZiNTE1 OGY1MzhjOGIzMmYyODViZTUgXQoKV2Ugc2hvdWxkIG5vdCBjYWxsIGVkYWNfbWNfZGVsX21jKCkg aWYgYSBjb3JyZXNwb25kaW5nIGNhbGwgdG8KZWRhY19tY19hZGRfbWMoKSBoYXMgbm90IGJlZW4g cGVyZm9ybWVkIHlldC4KClNvIGhlcmUsIHdlIHNob3VsZCBnbyB0byBlcnIgaW5zdGVhZCBvZiBl cnIyIHRvIGJyYW5jaCBhdCB0aGUgcmlnaHQKcGxhY2Ugb2YgdGhlIGVycm9yIGhhbmRsaW5nIHBh dGguCgpTaWduZWQtb2ZmLWJ5OiBDaHJpc3RvcGhlIEpBSUxMRVQgPGNocmlzdG9waGUuamFpbGxl dEB3YW5hZG9vLmZyPgpDYzogbGludXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+ Ckxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MDEwNzIwNTQwMC4xNDA2OC0xLWNo cmlzdG9waGUuamFpbGxldEB3YW5hZG9vLmZyClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBldGtv diA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPGFsZXhhbmRlci5sZXZp bkBtaWNyb3NvZnQuY29tPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdr aEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGRyaXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYyB8 ICAgIDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoK CgpQYXRjaGVzIGN1cnJlbnRseSBpbiBzdGFibGUtcXVldWUgd2hpY2ggbWlnaHQgYmUgZnJvbSBj aHJpc3RvcGhlLmphaWxsZXRAd2FuYWRvby5mciBhcmUKCnF1ZXVlLTQuMTUvZWRhYy1tdjY0eDYw LWZpeC1hbi1lcnJvci1oYW5kbGluZy1wYXRoLnBhdGNoCnF1ZXVlLTQuMTUvYXNvYy1pbnRlbC1z c3QtZml4LXRoZS1yZXR1cm4tdmFsdWUtb2Ytc3N0X3NlbmRfYnl0ZV9zdHJlYW1fbXJmbGQucGF0 Y2gKLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vi c2NyaWJlIGxpbnV4LWVkYWMiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9A dmdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5l bC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAoKLS0tIGEvZHJpdmVycy9lZGFjL212NjR4NjBfZWRh Yy5jCisrKyBiL2RyaXZlcnMvZWRhYy9tdjY0eDYwX2VkYWMuYwpAQCAtNzU4LDcgKzc1OCw3IEBA IHN0YXRpYyBpbnQgbXY2NHg2MF9tY19lcnJfcHJvYmUoc3RydWN0IHAKIAkJLyogTm9uLUVDQyBS QU0/ICovCiAJCXByaW50ayhLRVJOX1dBUk5JTkcgIiVzOiBObyBFQ0MgRElNTXMgZGlzY292ZXJl ZFxuIiwgX19mdW5jX18pOwogCQlyZXMgPSAtRU5PREVWOwotCQlnb3RvIGVycjI7CisJCWdvdG8g ZXJyOwogCX0KIAogCWVkYWNfZGJnKDMsICJpbml0IG1jaVxuIik7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:42590 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751875AbeDIJhM (ORCPT ); Mon, 9 Apr 2018 05:37:12 -0400 Subject: Patch "EDAC, mv64x60: Fix an error handling path" has been added to the 4.15-stable tree To: christophe.jaillet@wanadoo.fr, alexander.levin@microsoft.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: , From: Date: Mon, 09 Apr 2018 11:36:15 +0200 Message-ID: <1523266575121148@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled EDAC, mv64x60: Fix an error handling path to the 4.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: edac-mv64x60-fix-an-error-handling-path.patch and it can be found in the queue-4.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Mon Apr 9 10:16:32 CEST 2018 From: Christophe JAILLET Date: Sun, 7 Jan 2018 21:54:00 +0100 Subject: EDAC, mv64x60: Fix an error handling path 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"); Patches currently in stable-queue which might be from christophe.jaillet@wanadoo.fr are queue-4.15/edac-mv64x60-fix-an-error-handling-path.patch queue-4.15/asoc-intel-sst-fix-the-return-value-of-sst_send_byte_stream_mrfld.patch