Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Ensure index stays within bounds in amd64_get_scrub_rate

+1 -1
+1 -1
drivers/edac/amd64_edac.c
··· 197 197 edac_printk(KERN_DEBUG, EDAC_MC, 198 198 "pci-read, sdram scrub control value: %d \n", scrubval); 199 199 200 - for (i = 0; ARRAY_SIZE(scrubrates); i++) { 200 + for (i = 0; i < ARRAY_SIZE(scrubrates); i++) { 201 201 if (scrubrates[i].scrubval == scrubval) { 202 202 *bw = scrubrates[i].bandwidth; 203 203 status = 0;