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: [4.14,085/110] EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL From: Greg Kroah-Hartman Message-Id: <20180307191050.728230640@linuxfoundation.org> Date: Wed, 7 Mar 2018 11:39:08 -0800 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Anna Karbownik , Mauro Carvalho Chehab , Tony Luck , jim.m.snow@intel.com, krzysztof.paliswiat@intel.com, lukasz.odzioba@intel.com, qiuxu.zhuo@intel.com, linux-edac , Borislav Petkov List-ID: NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBBbm5hIEthcmJv d25payA8YW5uYS5rYXJib3duaWtAaW50ZWwuY29tPgoKY29tbWl0IGJmODQ4NjcwOWFjN2ZhZDk5 ZTQwNDBkZWE3M2ZlNDY2YzU3YTRhZTEgdXBzdHJlYW0uCgpDb21taXQKCiAgMzI4NmQzZWI5MDZj ICgiRURBQywgc2JfZWRhYzogRHJvcCBOVU1fQ0hBTk5FTFMgZnJvbSA4IGJhY2sgdG8gNCIpCgpk ZWNyZWFzZWQgTlVNX0NIQU5ORUxTIGZyb20gOCB0byA0LCBidXQgdGhpcyBpcyBub3QgZW5vdWdo IGZvciBLbmlnaHRzCkxhbmRpbmcgd2hpY2ggc3VwcG9ydHMgdXAgdG8gNiBjaGFubmVscy4KClRo aXMgY2F1c2VkIG91dC1vZi1ib3VuZHMgd3JpdGVzIHRvIHB2dC0+bWlycm9yX21vZGUgYW5kIHB2 dC0+dG9sbQp2YXJpYWJsZXMgd2hpY2ggZG9uJ3QgcGF5IGNyaXRpY2FsIHJvbGUgb24gS05MIGNv ZGUgcGF0aCwgc28gdGhlIG1lbW9yeQpjb3JydXB0aW9uIHdhc24ndCBjYXVzaW5nIGFueSB2aXNp YmxlIGRyaXZlciBmYWlsdXJlcy4KClRoZSBlYXNpZXN0IHdheSBvZiBmaXhpbmcgaXQgaXMgdG8g Y2hhbmdlIE5VTV9DSEFOTkVMUyB0byA2LiBEbyB0aGF0LgoKQW4gYWx0ZXJuYXRpdmUgc29sdXRp b24gd291bGQgYmUgdG8gcmVzdHJ1Y3R1cmUgdGhlIEtOTCBwYXJ0IG9mIHRoZQpkcml2ZXIgdG8g Mk1DLzNjaGFubmVsIHJlcHJlc2VudGF0aW9uLgoKUmVwb3J0ZWQtYnk6IERhbiBDYXJwZW50ZXIg PGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KU2lnbmVkLW9mZi1ieTogQW5uYSBLYXJib3duaWsg PGFubmEua2FyYm93bmlrQGludGVsLmNvbT4KQ2M6IE1hdXJvIENhcnZhbGhvIENoZWhhYiA8bWNo ZWhhYkBrZXJuZWwub3JnPgpDYzogVG9ueSBMdWNrIDx0b255Lmx1Y2tAaW50ZWwuY29tPgpDYzog amltLm0uc25vd0BpbnRlbC5jb20KQ2M6IGtyenlzenRvZi5wYWxpc3dpYXRAaW50ZWwuY29tCkNj OiBsdWthc3oub2R6aW9iYUBpbnRlbC5jb20KQ2M6IHFpdXh1LnpodW9AaW50ZWwuY29tCkNjOiBs aW51eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KQ2M6IDxzdGFibGVAdmdlci5r ZXJuZWwub3JnPgpGaXhlczogMzI4NmQzZWI5MDZjICgiRURBQywgc2JfZWRhYzogRHJvcCBOVU1f Q0hBTk5FTFMgZnJvbSA4IGJhY2sgdG8gNCIpCkxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcv ci8xNTE5MzEyNjkzLTQ3ODktMS1naXQtc2VuZC1lbWFpbC1hbm5hLmthcmJvd25pa0BpbnRlbC5j b20KWyBNYXNzYWdlIGNvbW1pdCBtZXNzYWdlLiBdClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2IFBl dGtvdiA8YnBAc3VzZS5kZT4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVn a2hAbGludXhmb3VuZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL2VkYWMvc2JfZWRhYy5jIHwgICAg MiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgoKCi0t ClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNjcmli ZSBsaW51eC1lZGFjIiBpbgp0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8gbWFqb3Jkb21vQHZnZXIu a2VybmVsLm9yZwpNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8vdmdlci5rZXJuZWwub3Jn L21ham9yZG9tby1pbmZvLmh0bWwKCi0tLSBhL2RyaXZlcnMvZWRhYy9zYl9lZGFjLmMKKysrIGIv ZHJpdmVycy9lZGFjL3NiX2VkYWMuYwpAQCAtMjc5LDcgKzI3OSw3IEBAIHN0YXRpYyBjb25zdCB1 MzIgY29ycmVycnRocnNsZFtdID0gewogICogc2JyaWRnZSBzdHJ1Y3RzCiAgKi8KIAotI2RlZmlu ZSBOVU1fQ0hBTk5FTFMJCTQJLyogTWF4IGNoYW5uZWxzIHBlciBNQyAqLworI2RlZmluZSBOVU1f Q0hBTk5FTFMJCTYJLyogTWF4IGNoYW5uZWxzIHBlciBNQyAqLwogI2RlZmluZSBNQVhfRElNTVMJ CTMJLyogTWF4IERJTU1TIHBlciBjaGFubmVsICovCiAjZGVmaW5lIEtOTF9NQVhfQ0hBUwkJMzgJ LyogS05MIG1heCBudW0uIG9mIENhY2hlIEhvbWUgQWdlbnRzICovCiAjZGVmaW5lIEtOTF9NQVhf Q0hBTk5FTFMJNgkvKiBLTkwgbWF4IG51bS4gb2YgUENJIGNoYW5uZWxzICovCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELu9kw7SsUstE0Rkk0rSM/veb3qRCrlPbR96KssC4YwBRBJSNtg3K6wM80M/Mi0zcK3mgyBC ARC-Seal: i=1; a=rsa-sha256; t=1520452046; cv=none; d=google.com; s=arc-20160816; b=jzr2+rTqgtNhB5aSoYgganFINYA/x0j27QbgnUnaoU5ZGORX8uv2PH9HKCGRGpklPH aDDC8G8LDb8saQsv9y8KbW9ng0EoYJEGz+5ifsS1upWBi/pEjzvFP6yJsX+XvB9Wuvru pqzRPmNCdXhH4AvSYW/Y9c5bA2LcFeFAejABikkwOWcaFBhaSLy6wcv3XL9QgyjItVYU 3+j0UiNECQ+bKndCS5+u1wWN4p3xDb9ZYQbXy3VqVDZO720Q4bWdV5xS7tTByLLEup9i RneEGxdd4QhOs6ZrEgi9S4Q8m1QvH9Uz8eoPgJdfaO+v+BJS11+HroGwlHMuiJ7SD6wd 3gNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Fp1ZZnoL6vFLX0oL2jhe/Wuai+jMNgj/LQv0lre36Cg=; b=NF7gC3UjygCYGiFuzGJEhBFVWEO6NTHiccDcQ1/eBAGB7uG+tMNupCeU0CLdtnjvrl FGP27a6mWbBINvAlQRh+GPXgUee951c7D/F2U8zzUabHYq3wiBK3VlyLWSQnF90gaMUe EvyCa7c8345ngp3cpXx0JMBKFANzgi190NEA/LU5v2rFhcyGd+jgWHGldtltKHX9zUIF vHS+X7xvB5V84eyj++sZPu2iEmZO7WJvggxzfG2OFvmaP+kh7p+m00raKVLZPjtMGagw 19s5QfYpXQxHKnuNhwmeZPS6Fb8Rif6pvUViGIppms2KBwXbwMbXH+8GnxFnpQwnlfwz x00A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 185.236.200.248 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 185.236.200.248 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Anna Karbownik , Mauro Carvalho Chehab , Tony Luck , jim.m.snow@intel.com, krzysztof.paliswiat@intel.com, lukasz.odzioba@intel.com, qiuxu.zhuo@intel.com, linux-edac , Borislav Petkov Subject: [PATCH 4.14 085/110] EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL Date: Wed, 7 Mar 2018 11:39:08 -0800 Message-Id: <20180307191050.728230640@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180307191039.748351103@linuxfoundation.org> References: <20180307191039.748351103@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594309271673449358?= X-GMAIL-MSGID: =?utf-8?q?1594309525942267265?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ 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 */