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, sb_edac: Fix out of bound writes during DIMM configuration on KNL" has been added to the 4.14-stable tree From: Greg Kroah-Hartman Message-Id: <1520394847097@kroah.com> Date: Tue, 06 Mar 2018 19:54:08 -0800 To: anna.karbownik@intel.com, bp@suse.de, dan.carpenter@oracle.com, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org, mchehab@kernel.org, stable@vger.kernel.org, tony.luck@intel.com Cc: stable-commits@vger.kernel.org List-ID: VGhpcyBpcyBhIG5vdGUgdG8gbGV0IHlvdSBrbm93IHRoYXQgSSd2ZSBqdXN0IGFkZGVkIHRoZSBw YXRjaCB0aXRsZWQKCiAgICBFREFDLCBzYl9lZGFjOiBGaXggb3V0IG9mIGJvdW5kIHdyaXRlcyBk dXJpbmcgRElNTSBjb25maWd1cmF0aW9uIG9uIEtOTAoKdG8gdGhlIDQuMTQtc3RhYmxlIHRyZWUg d2hpY2ggY2FuIGJlIGZvdW5kIGF0OgogICAgaHR0cDovL3d3dy5rZXJuZWwub3JnL2dpdC8/cD1s aW51eC9rZXJuZWwvZ2l0L3N0YWJsZS9zdGFibGUtcXVldWUuZ2l0O2E9c3VtbWFyeQoKVGhlIGZp bGVuYW1lIG9mIHRoZSBwYXRjaCBpczoKICAgICBlZGFjLXNiX2VkYWMtZml4LW91dC1vZi1ib3Vu ZC13cml0ZXMtZHVyaW5nLWRpbW0tY29uZmlndXJhdGlvbi1vbi1rbmwucGF0Y2gKYW5kIGl0IGNh biBiZSBmb3VuZCBpbiB0aGUgcXVldWUtNC4xNCBzdWJkaXJlY3RvcnkuCgpJZiB5b3UsIG9yIGFu eW9uZSBlbHNlLCBmZWVscyBpdCBzaG91bGQgbm90IGJlIGFkZGVkIHRvIHRoZSBzdGFibGUgdHJl ZSwKcGxlYXNlIGxldCA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4ga25vdyBhYm91dCBpdC4KCgpG cm9tIGJmODQ4NjcwOWFjN2ZhZDk5ZTQwNDBkZWE3M2ZlNDY2YzU3YTRhZTEgTW9uIFNlcCAxNyAw MDowMDowMCAyMDAxCkZyb206IEFubmEgS2FyYm93bmlrIDxhbm5hLmthcmJvd25pa0BpbnRlbC5j b20+CkRhdGU6IFRodSwgMjIgRmViIDIwMTggMTY6MTg6MTMgKzAxMDAKU3ViamVjdDogRURBQywg c2JfZWRhYzogRml4IG91dCBvZiBib3VuZCB3cml0ZXMgZHVyaW5nIERJTU0gY29uZmlndXJhdGlv biBvbiBLTkwKCkZyb206IEFubmEgS2FyYm93bmlrIDxhbm5hLmthcmJvd25pa0BpbnRlbC5jb20+ Cgpjb21taXQgYmY4NDg2NzA5YWM3ZmFkOTllNDA0MGRlYTczZmU0NjZjNTdhNGFlMSB1cHN0cmVh bS4KCkNvbW1pdAoKICAzMjg2ZDNlYjkwNmMgKCJFREFDLCBzYl9lZGFjOiBEcm9wIE5VTV9DSEFO TkVMUyBmcm9tIDggYmFjayB0byA0IikKCmRlY3JlYXNlZCBOVU1fQ0hBTk5FTFMgZnJvbSA4IHRv IDQsIGJ1dCB0aGlzIGlzIG5vdCBlbm91Z2ggZm9yIEtuaWdodHMKTGFuZGluZyB3aGljaCBzdXBw b3J0cyB1cCB0byA2IGNoYW5uZWxzLgoKVGhpcyBjYXVzZWQgb3V0LW9mLWJvdW5kcyB3cml0ZXMg dG8gcHZ0LT5taXJyb3JfbW9kZSBhbmQgcHZ0LT50b2xtCnZhcmlhYmxlcyB3aGljaCBkb24ndCBw YXkgY3JpdGljYWwgcm9sZSBvbiBLTkwgY29kZSBwYXRoLCBzbyB0aGUgbWVtb3J5CmNvcnJ1cHRp b24gd2Fzbid0IGNhdXNpbmcgYW55IHZpc2libGUgZHJpdmVyIGZhaWx1cmVzLgoKVGhlIGVhc2ll c3Qgd2F5IG9mIGZpeGluZyBpdCBpcyB0byBjaGFuZ2UgTlVNX0NIQU5ORUxTIHRvIDYuIERvIHRo YXQuCgpBbiBhbHRlcm5hdGl2ZSBzb2x1dGlvbiB3b3VsZCBiZSB0byByZXN0cnVjdHVyZSB0aGUg S05MIHBhcnQgb2YgdGhlCmRyaXZlciB0byAyTUMvM2NoYW5uZWwgcmVwcmVzZW50YXRpb24uCgpS ZXBvcnRlZC1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBBbm5hIEthcmJvd25payA8YW5uYS5rYXJib3duaWtAaW50ZWwuY29tPgpDYzog TWF1cm8gQ2FydmFsaG8gQ2hlaGFiIDxtY2hlaGFiQGtlcm5lbC5vcmc+CkNjOiBUb255IEx1Y2sg PHRvbnkubHVja0BpbnRlbC5jb20+CkNjOiBqaW0ubS5zbm93QGludGVsLmNvbQpDYzoga3J6eXN6 dG9mLnBhbGlzd2lhdEBpbnRlbC5jb20KQ2M6IGx1a2Fzei5vZHppb2JhQGludGVsLmNvbQpDYzog cWl1eHUuemh1b0BpbnRlbC5jb20KQ2M6IGxpbnV4LWVkYWMgPGxpbnV4LWVkYWNAdmdlci5rZXJu ZWwub3JnPgpDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+CkZpeGVzOiAzMjg2ZDNlYjkwNmMg KCJFREFDLCBzYl9lZGFjOiBEcm9wIE5VTV9DSEFOTkVMUyBmcm9tIDggYmFjayB0byA0IikKTGlu azogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzE1MTkzMTI2OTMtNDc4OS0xLWdpdC1zZW5kLWVt YWlsLWFubmEua2FyYm93bmlrQGludGVsLmNvbQpbIE1hc3NhZ2UgY29tbWl0IG1lc3NhZ2UuIF0K U2lnbmVkLW9mZi1ieTogQm9yaXNsYXYgUGV0a292IDxicEBzdXNlLmRlPgpTaWduZWQtb2ZmLWJ5 OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGRy aXZlcnMvZWRhYy9zYl9lZGFjLmMgfCAgICAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKyksIDEgZGVsZXRpb24oLSkKCgoKUGF0Y2hlcyBjdXJyZW50bHkgaW4gc3RhYmxlLXF1ZXVl IHdoaWNoIG1pZ2h0IGJlIGZyb20gYW5uYS5rYXJib3duaWtAaW50ZWwuY29tIGFyZQoKcXVldWUt NC4xNC9lZGFjLXNiX2VkYWMtZml4LW91dC1vZi1ib3VuZC13cml0ZXMtZHVyaW5nLWRpbW0tY29u ZmlndXJhdGlvbi1vbi1rbmwucGF0Y2gKLS0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6 IHNlbmQgdGhlIGxpbmUgInVuc3Vic2NyaWJlIGxpbnV4LWVkYWMiIGluCnRoZSBib2R5IG9mIGEg bWVzc2FnZSB0byBtYWpvcmRvbW9Admdlci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8g YXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5vcmcvbWFqb3Jkb21vLWluZm8uaHRtbAoKLS0tIGEvZHJp dmVycy9lZGFjL3NiX2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvc2JfZWRhYy5jCkBAIC0yNzks NyArMjc5LDcgQEAgc3RhdGljIGNvbnN0IHUzMiBjb3JyZXJydGhyc2xkW10gPSB7CiAgKiBzYnJp ZGdlIHN0cnVjdHMKICAqLwogCi0jZGVmaW5lIE5VTV9DSEFOTkVMUwkJNAkvKiBNYXggY2hhbm5l bHMgcGVyIE1DICovCisjZGVmaW5lIE5VTV9DSEFOTkVMUwkJNgkvKiBNYXggY2hhbm5lbHMgcGVy IE1DICovCiAjZGVmaW5lIE1BWF9ESU1NUwkJMwkvKiBNYXggRElNTVMgcGVyIGNoYW5uZWwgKi8K ICNkZWZpbmUgS05MX01BWF9DSEFTCQkzOAkvKiBLTkwgbWF4IG51bS4gb2YgQ2FjaGUgSG9tZSBB Z2VudHMgKi8KICNkZWZpbmUgS05MX01BWF9DSEFOTkVMUwk2CS8qIEtOTCBtYXggbnVtLiBvZiBQ Q0kgY2hhbm5lbHMgKi8K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:59260 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933020AbeCGDyT (ORCPT ); Tue, 6 Mar 2018 22:54:19 -0500 Subject: Patch "EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL" has been added to the 4.14-stable tree To: anna.karbownik@intel.com, bp@suse.de, dan.carpenter@oracle.com, gregkh@linuxfoundation.org, linux-edac@vger.kernel.org, mchehab@kernel.org, stable@vger.kernel.org, tony.luck@intel.com Cc: , From: Date: Tue, 06 Mar 2018 19:54:08 -0800 Message-ID: <1520394847097@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, sb_edac: Fix out of bound writes during DIMM configuration on KNL to the 4.14-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-sb_edac-fix-out-of-bound-writes-during-dimm-configuration-on-knl.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From bf8486709ac7fad99e4040dea73fe466c57a4ae1 Mon Sep 17 00:00:00 2001 From: Anna Karbownik Date: Thu, 22 Feb 2018 16:18:13 +0100 Subject: EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL From: Anna Karbownik commit bf8486709ac7fad99e4040dea73fe466c57a4ae1 upstream. Commit 3286d3eb906c ("EDAC, sb_edac: Drop NUM_CHANNELS from 8 back to 4") decreased NUM_CHANNELS from 8 to 4, but this is not enough for Knights Landing which supports up to 6 channels. This caused out-of-bounds writes to pvt->mirror_mode and pvt->tolm variables which don't pay critical role on KNL code path, so the memory corruption wasn't causing any visible driver failures. The easiest way of fixing it is to change NUM_CHANNELS to 6. Do that. An alternative solution would be to restructure the KNL part of the driver to 2MC/3channel representation. Reported-by: Dan Carpenter Signed-off-by: Anna Karbownik Cc: Mauro Carvalho Chehab Cc: Tony Luck Cc: jim.m.snow@intel.com Cc: krzysztof.paliswiat@intel.com Cc: lukasz.odzioba@intel.com Cc: qiuxu.zhuo@intel.com Cc: linux-edac Cc: Fixes: 3286d3eb906c ("EDAC, sb_edac: Drop NUM_CHANNELS from 8 back to 4") Link: http://lkml.kernel.org/r/1519312693-4789-1-git-send-email-anna.karbownik@intel.com [ Massage commit message. ] Signed-off-by: Borislav Petkov Signed-off-by: Greg Kroah-Hartman --- drivers/edac/sb_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -279,7 +279,7 @@ static const u32 correrrthrsld[] = { * sbridge structs */ -#define NUM_CHANNELS 4 /* Max channels per MC */ +#define NUM_CHANNELS 6 /* Max channels per MC */ #define MAX_DIMMS 3 /* Max DIMMS per channel */ #define KNL_MAX_CHAS 38 /* KNL max num. of Cache Home Agents */ #define KNL_MAX_CHANNELS 6 /* KNL max num. of PCI channels */ Patches currently in stable-queue which might be from anna.karbownik@intel.com are queue-4.14/edac-sb_edac-fix-out-of-bound-writes-during-dimm-configuration-on-knl.patch