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, amd64: Add x86cpuid sanity check during init" has been added to the 4.9-stable tree From: Greg Kroah-Hartman Message-Id: <151021856720830@kroah.com> Date: Thu, 09 Nov 2017 10:09:27 +0100 To: Yazen.Ghannam@amd.com, alexander.levin@verizon.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 YXRjaCB0aXRsZWQKCiAgICBFREFDLCBhbWQ2NDogQWRkIHg4NmNwdWlkIHNhbml0eSBjaGVjayBk dXJpbmcgaW5pdAoKdG8gdGhlIDQuOS1zdGFibGUgdHJlZSB3aGljaCBjYW4gYmUgZm91bmQgYXQ6 CiAgICBodHRwOi8vd3d3Lmtlcm5lbC5vcmcvZ2l0Lz9wPWxpbnV4L2tlcm5lbC9naXQvc3RhYmxl L3N0YWJsZS1xdWV1ZS5naXQ7YT1zdW1tYXJ5CgpUaGUgZmlsZW5hbWUgb2YgdGhlIHBhdGNoIGlz OgogICAgIGVkYWMtYW1kNjQtYWRkLXg4NmNwdWlkLXNhbml0eS1jaGVjay1kdXJpbmctaW5pdC5w YXRjaAphbmQgaXQgY2FuIGJlIGZvdW5kIGluIHRoZSBxdWV1ZS00Ljkgc3ViZGlyZWN0b3J5LgoK SWYgeW91LCBvciBhbnlvbmUgZWxzZSwgZmVlbHMgaXQgc2hvdWxkIG5vdCBiZSBhZGRlZCB0byB0 aGUgc3RhYmxlIHRyZWUsCnBsZWFzZSBsZXQgPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+IGtub3cg YWJvdXQgaXQuCgoKRnJvbSBmb29AYmF6IFRodSBOb3YgIDkgMDk6NDg6MDEgQ0VUIDIwMTcKRnJv bTogWWF6ZW4gR2hhbm5hbSA8WWF6ZW4uR2hhbm5hbUBhbWQuY29tPgpEYXRlOiBGcmksIDI3IEph biAyMDE3IDExOjI0OjIzIC0wNjAwClN1YmplY3Q6IEVEQUMsIGFtZDY0OiBBZGQgeDg2Y3B1aWQg c2FuaXR5IGNoZWNrIGR1cmluZyBpbml0CgpGcm9tOiBZYXplbiBHaGFubmFtIDxZYXplbi5HaGFu bmFtQGFtZC5jb20+CgoKWyBVcHN0cmVhbSBjb21taXQgMWJkOTkwMGI4MzAxZmM1MDVmMDMyYzkw ZWE0ODc4MjRjZjgyNGU5OSBdCgpNYXRjaCBvbmUgb2YgdGhlIGRldmljZXMgaW4gYW1kNjRfY3B1 aWRzW10gYmVmb3JlIGxvYWRpbmcgdGhlIG1vZHVsZS4KVGhpcyBpcyBhbiBhZGRpdGlvbmFsIHNh bml0eSBjaGVjayBhZ2FpbnN0IHVzZXJzIHRyeWluZyB0byBsb2FkCmFtZDY0X2VkYWNfbW9kIG9u IHVuc3VwcG9ydGVkIHN5c3RlbXMuCgpTaWduZWQtb2ZmLWJ5OiBZYXplbiBHaGFubmFtIDxZYXpl bi5HaGFubmFtQGFtZC5jb20+CkNjOiBsaW51eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVs Lm9yZz4KTGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzE0ODU1Mzc4NjMtMjcwNy05LWdp dC1zZW5kLWVtYWlsLVlhemVuLkdoYW5uYW1AYW1kLmNvbQpbIEdldCByaWQgb2YgZXJyX3JldCBs YWJlbCwgbWFrZSBpdCBhIGJpdCBtb3JlIHJlYWRhYmxlIHRoaXMgd2F5LiBdClNpZ25lZC1vZmYt Ynk6IEJvcmlzbGF2IFBldGtvdiA8YnBAc3VzZS5kZT4KClNpZ25lZC1vZmYtYnk6IFNhc2hhIExl dmluIDxhbGV4YW5kZXIubGV2aW5AdmVyaXpvbi5jb20+ClNpZ25lZC1vZmYtYnk6IEdyZWcgS3Jv YWgtSGFydG1hbiA8Z3JlZ2toQGxpbnV4Zm91bmRhdGlvbi5vcmc+Ci0tLQogZHJpdmVycy9lZGFj L2FtZDY0X2VkYWMuYyB8ICAgIDYgKysrKy0tCiBkcml2ZXJzL2VkYWMvYW1kNjRfZWRhYy5oIHwg ICAgMSArCiAyIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkK CgoKUGF0Y2hlcyBjdXJyZW50bHkgaW4gc3RhYmxlLXF1ZXVlIHdoaWNoIG1pZ2h0IGJlIGZyb20g WWF6ZW4uR2hhbm5hbUBhbWQuY29tIGFyZQoKcXVldWUtNC45L2VkYWMtYW1kNjQtYWRkLXg4NmNw dWlkLXNhbml0eS1jaGVjay1kdXJpbmctaW5pdC5wYXRjaApxdWV1ZS00LjkvZWRhYy1hbWQ2NC1z YXZlLWFuZC1yZXR1cm4tZXJyLWNvZGUtZnJvbS1wcm9iZV9vbmVfaW5zdGFuY2UucGF0Y2gKLS0K VG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJl IGxpbnV4LWVkYWMiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5r ZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcv bWFqb3Jkb21vLWluZm8uaHRtbAoKLS0tIGEvZHJpdmVycy9lZGFjL2FtZDY0X2VkYWMuYworKysg Yi9kcml2ZXJzL2VkYWMvYW1kNjRfZWRhYy5jCkBAIC0yOTg0LDggKzI5ODQsMTEgQEAgc3RhdGlj IGludCBfX2luaXQgYW1kNjRfZWRhY19pbml0KHZvaWQpCiAJaW50IGVyciA9IC1FTk9ERVY7CiAJ aW50IGk7CiAKKwlpZiAoIXg4Nl9tYXRjaF9jcHUoYW1kNjRfY3B1aWRzKSkKKwkJcmV0dXJuIC1F Tk9ERVY7CisKIAlpZiAoYW1kX2NhY2hlX25vcnRoYnJpZGdlcygpIDwgMCkKLQkJZ290byBlcnJf cmV0OworCQlyZXR1cm4gLUVOT0RFVjsKIAogCW9wc3RhdGVfaW5pdCgpOwogCkBAIC0zMDI1LDcg KzMwMjgsNiBAQCBlcnJfZnJlZToKIAlrZnJlZShlY2Nfc3RuZ3MpOwogCWVjY19zdG5ncyA9IE5V TEw7CiAKLWVycl9yZXQ6CiAJcmV0dXJuIGVycjsKIH0KIAotLS0gYS9kcml2ZXJzL2VkYWMvYW1k NjRfZWRhYy5oCisrKyBiL2RyaXZlcnMvZWRhYy9hbWQ2NF9lZGFjLmgKQEAgLTE2LDYgKzE2LDcg QEAKICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+CiAjaW5jbHVkZSA8bGludXgvbW16b25lLmg+CiAj aW5jbHVkZSA8bGludXgvZWRhYy5oPgorI2luY2x1ZGUgPGFzbS9jcHVfZGV2aWNlX2lkLmg+CiAj aW5jbHVkZSA8YXNtL21zci5oPgogI2luY2x1ZGUgImVkYWNfY29yZS5oIgogI2luY2x1ZGUgIm1j ZV9hbWQuaCIK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54330 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753752AbdKIJJk (ORCPT ); Thu, 9 Nov 2017 04:09:40 -0500 Subject: Patch "EDAC, amd64: Add x86cpuid sanity check during init" has been added to the 4.9-stable tree To: Yazen.Ghannam@amd.com, alexander.levin@verizon.com, bp@suse.de, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org Cc: , From: Date: Thu, 09 Nov 2017 10:09:27 +0100 Message-ID: <151021856720830@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, amd64: Add x86cpuid sanity check during init to the 4.9-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-amd64-add-x86cpuid-sanity-check-during-init.patch and it can be found in the queue-4.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Nov 9 09:48:01 CET 2017 From: Yazen Ghannam Date: Fri, 27 Jan 2017 11:24:23 -0600 Subject: EDAC, amd64: Add x86cpuid sanity check during init From: Yazen Ghannam [ Upstream commit 1bd9900b8301fc505f032c90ea487824cf824e99 ] Match one of the devices in amd64_cpuids[] before loading the module. This is an additional sanity check against users trying to load amd64_edac_mod on unsupported systems. Signed-off-by: Yazen Ghannam Cc: linux-edac Link: http://lkml.kernel.org/r/1485537863-2707-9-git-send-email-Yazen.Ghannam@amd.com [ Get rid of err_ret label, make it a bit more readable this way. ] Signed-off-by: Borislav Petkov Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/edac/amd64_edac.c | 6 ++++-- drivers/edac/amd64_edac.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2984,8 +2984,11 @@ static int __init amd64_edac_init(void) int err = -ENODEV; int i; + if (!x86_match_cpu(amd64_cpuids)) + return -ENODEV; + if (amd_cache_northbridges() < 0) - goto err_ret; + return -ENODEV; opstate_init(); @@ -3025,7 +3028,6 @@ err_free: kfree(ecc_stngs); ecc_stngs = NULL; -err_ret: return err; } --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h @@ -16,6 +16,7 @@ #include #include #include +#include #include #include "edac_core.h" #include "mce_amd.h" Patches currently in stable-queue which might be from Yazen.Ghannam@amd.com are queue-4.9/edac-amd64-add-x86cpuid-sanity-check-during-init.patch queue-4.9/edac-amd64-save-and-return-err-code-from-probe_one_instance.patch