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.4-stable tree From: Greg Kroah-Hartman Message-Id: <152335103074131@kroah.com> Date: Tue, 10 Apr 2018 11:03:50 +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 aAoKdG8gdGhlIDQuNC1zdGFibGUgdHJlZSB3aGljaCBjYW4gYmUgZm91bmQgYXQ6CiAgICBodHRw Oi8vd3d3Lmtlcm5lbC5vcmcvZ2l0Lz9wPWxpbnV4L2tlcm5lbC9naXQvc3RhYmxlL3N0YWJsZS1x dWV1ZS5naXQ7YT1zdW1tYXJ5CgpUaGUgZmlsZW5hbWUgb2YgdGhlIHBhdGNoIGlzOgogICAgIGVk YWMtbXY2NHg2MC1maXgtYW4tZXJyb3ItaGFuZGxpbmctcGF0aC5wYXRjaAphbmQgaXQgY2FuIGJl IGZvdW5kIGluIHRoZSBxdWV1ZS00LjQgc3ViZGlyZWN0b3J5LgoKSWYgeW91LCBvciBhbnlvbmUg ZWxzZSwgZmVlbHMgaXQgc2hvdWxkIG5vdCBiZSBhZGRlZCB0byB0aGUgc3RhYmxlIHRyZWUsCnBs ZWFzZSBsZXQgPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+IGtub3cgYWJvdXQgaXQuCgoKRnJvbSBm b29AYmF6IFR1ZSBBcHIgMTAgMTA6MzE6NTMgQ0VTVCAyMDE4CkZyb206IENocmlzdG9waGUgSkFJ TExFVCA8Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI+CkRhdGU6IFN1biwgNyBKYW4gMjAx OCAyMTo1NDowMCArMDEwMApTdWJqZWN0OiBFREFDLCBtdjY0eDYwOiBGaXggYW4gZXJyb3IgaGFu ZGxpbmcgcGF0aAoKRnJvbTogQ2hyaXN0b3BoZSBKQUlMTEVUIDxjaHJpc3RvcGhlLmphaWxsZXRA d2FuYWRvby5mcj4KCgpbIFVwc3RyZWFtIGNvbW1pdCA2OGZhMjRmOTEyMWMwNGVmMTQ2YjUxNThm NTM4YzhiMzJmMjg1YmU1IF0KCldlIHNob3VsZCBub3QgY2FsbCBlZGFjX21jX2RlbF9tYygpIGlm IGEgY29ycmVzcG9uZGluZyBjYWxsIHRvCmVkYWNfbWNfYWRkX21jKCkgaGFzIG5vdCBiZWVuIHBl cmZvcm1lZCB5ZXQuCgpTbyBoZXJlLCB3ZSBzaG91bGQgZ28gdG8gZXJyIGluc3RlYWQgb2YgZXJy MiB0byBicmFuY2ggYXQgdGhlIHJpZ2h0CnBsYWNlIG9mIHRoZSBlcnJvciBoYW5kbGluZyBwYXRo LgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0b3BoZSBKQUlMTEVUIDxjaHJpc3RvcGhlLmphaWxsZXRA d2FuYWRvby5mcj4KQ2M6IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNAdmdlci5rZXJuZWwub3JnPgpM aW5rOiBodHRwOi8vbGttbC5rZXJuZWwub3JnL3IvMjAxODAxMDcyMDU0MDAuMTQwNjgtMS1jaHJp c3RvcGhlLmphaWxsZXRAd2FuYWRvby5mcgpTaWduZWQtb2ZmLWJ5OiBCb3Jpc2xhdiBQZXRrb3Yg PGJwQHN1c2UuZGU+ClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxhbGV4YW5kZXIubGV2aW5A bWljcm9zb2Z0LmNvbT4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hA bGludXhmb3VuZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL2VkYWMvbXY2NHg2MF9lZGFjLmMgfCAg ICAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCgoK UGF0Y2hlcyBjdXJyZW50bHkgaW4gc3RhYmxlLXF1ZXVlIHdoaWNoIG1pZ2h0IGJlIGZyb20gY2hy aXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnIgYXJlCgpxdWV1ZS00LjQvY3B1aWRsZS1kdC1hZGQt bWlzc2luZy1vZl9ub2RlX3B1dC5wYXRjaApxdWV1ZS00LjQvZWRhYy1tdjY0eDYwLWZpeC1hbi1l cnJvci1oYW5kbGluZy1wYXRoLnBhdGNoCnF1ZXVlLTQuNC9zbWIyLWZpeC1zaGFyZS10eXBlLWhh bmRsaW5nLnBhdGNoCnF1ZXVlLTQuNC9hc29jLWludGVsLXNzdC1maXgtdGhlLXJldHVybi12YWx1 ZS1vZi1zc3Rfc2VuZF9ieXRlX3N0cmVhbV9tcmZsZC5wYXRjaAotLQpUbyB1bnN1YnNjcmliZSBm cm9tIHRoaXMgbGlzdDogc2VuZCB0aGUgbGluZSAidW5zdWJzY3JpYmUgbGludXgtZWRhYyIgaW4K dGhlIGJvZHkgb2YgYSBtZXNzYWdlIHRvIG1ham9yZG9tb0B2Z2VyLmtlcm5lbC5vcmcKTW9yZSBt YWpvcmRvbW8gaW5mbyBhdCAgaHR0cDovL3ZnZXIua2VybmVsLm9yZy9tYWpvcmRvbW8taW5mby5o dG1sCgotLS0gYS9kcml2ZXJzL2VkYWMvbXY2NHg2MF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFj L212NjR4NjBfZWRhYy5jCkBAIC03NjMsNyArNzYzLDcgQEAgc3RhdGljIGludCBtdjY0eDYwX21j X2Vycl9wcm9iZShzdHJ1Y3QgcAogCQkvKiBOb24tRUNDIFJBTT8gKi8KIAkJcHJpbnRrKEtFUk5f V0FSTklORyAiJXM6IE5vIEVDQyBESU1NcyBkaXNjb3ZlcmVkXG4iLCBfX2Z1bmNfXyk7CiAJCXJl cyA9IC1FTk9ERVY7Ci0JCWdvdG8gZXJyMjsKKwkJZ290byBlcnI7CiAJfQogCiAJZWRhY19kYmco MywgImluaXQgbWNpXG4iKTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57032 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752530AbeDJJEl (ORCPT ); Tue, 10 Apr 2018 05:04:41 -0400 Subject: Patch "EDAC, mv64x60: Fix an error handling path" has been added to the 4.4-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: Tue, 10 Apr 2018 11:03:50 +0200 Message-ID: <152335103074131@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.4-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.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Tue Apr 10 10:31:53 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 @@ -763,7 +763,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.4/cpuidle-dt-add-missing-of_node_put.patch queue-4.4/edac-mv64x60-fix-an-error-handling-path.patch queue-4.4/smb2-fix-share-type-handling.patch queue-4.4/asoc-intel-sst-fix-the-return-value-of-sst_send_byte_stream_mrfld.patch