From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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
Subject: Patch "EDAC, amd64: Add x86cpuid sanity check during init" has been added to the 4.9-stable tree
Date: Thu, 09 Nov 2017 10:09:27 +0100 [thread overview]
Message-ID: <151021856720830@kroah.com> (raw)
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 <stable@vger.kernel.org> know about it.
From foo@baz Thu Nov 9 09:48:01 CET 2017
From: Yazen Ghannam <Yazen.Ghannam@amd.com>
Date: Fri, 27 Jan 2017 11:24:23 -0600
Subject: EDAC, amd64: Add x86cpuid sanity check during init
From: Yazen Ghannam <Yazen.Ghannam@amd.com>
[ 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 <Yazen.Ghannam@amd.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
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 <bp@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/edac/amd64_edac.c | 6 ++++--
drivers/edac/amd64_edac.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
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
--
To unsubscribe from this list: send the line "unsubscribe linux-edac" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 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 <linux/slab.h>
#include <linux/mmzone.h>
#include <linux/edac.h>
+#include <asm/cpu_device_id.h>
#include <asm/msr.h>
#include "edac_core.h"
#include "mce_amd.h"
WARNING: multiple messages have this Message-ID (diff)
From: <gregkh@linuxfoundation.org>
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>
Subject: Patch "EDAC, amd64: Add x86cpuid sanity check during init" has been added to the 4.9-stable tree
Date: Thu, 09 Nov 2017 10:09:27 +0100 [thread overview]
Message-ID: <151021856720830@kroah.com> (raw)
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 <stable@vger.kernel.org> know about it.
>From foo@baz Thu Nov 9 09:48:01 CET 2017
From: Yazen Ghannam <Yazen.Ghannam@amd.com>
Date: Fri, 27 Jan 2017 11:24:23 -0600
Subject: EDAC, amd64: Add x86cpuid sanity check during init
From: Yazen Ghannam <Yazen.Ghannam@amd.com>
[ 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 <Yazen.Ghannam@amd.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
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 <bp@suse.de>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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 <linux/slab.h>
#include <linux/mmzone.h>
#include <linux/edac.h>
+#include <asm/cpu_device_id.h>
#include <asm/msr.h>
#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
next reply other threads:[~2017-11-09 9:09 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-09 9:09 Greg Kroah-Hartman [this message]
2017-11-09 9:09 ` Patch "EDAC, amd64: Add x86cpuid sanity check during init" has been added to the 4.9-stable tree gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=151021856720830@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Yazen.Ghannam@amd.com \
--cc=alexander.levin@verizon.com \
--cc=bp@suse.de \
--cc=linux-edac@vger.kernel.org \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.