4.15-stable review patch.  If anyone has any objections, please let me know.


From: Anna Karbownik <anna.karbow...@intel.com>

commit bf8486709ac7fad99e4040dea73fe466c57a4ae1 upstream.


  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 <dan.carpen...@oracle.com>
Signed-off-by: Anna Karbownik <anna.karbow...@intel.com>
Cc: Mauro Carvalho Chehab <mche...@kernel.org>
Cc: Tony Luck <tony.l...@intel.com>
Cc: jim.m.s...@intel.com
Cc: krzysztof.palisw...@intel.com
Cc: lukasz.odzi...@intel.com
Cc: qiuxu.z...@intel.com
Cc: linux-edac <linux-e...@vger.kernel.org>
Cc: <sta...@vger.kernel.org>
Fixes: 3286d3eb906c ("EDAC, sb_edac: Drop NUM_CHANNELS from 8 back to 4")
[ Massage commit message. ]
Signed-off-by: Borislav Petkov <b...@suse.de>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

 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 */

Reply via email to