Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf0c346b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3b3ef308 926311fd

drivers/edac/amd64_edac.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int amd64_get_scrub_rate(struct mem_ctl_info *mci, u32 *bw) 
	edac_printk(KERN_DEBUG, EDAC_MC,

		    "pci-read, sdram scrub control value: %d \n", scrubval);



	for (i = 0; ARRAY_SIZE(scrubrates); i++) {

	for (i = 0; i < ARRAY_SIZE(scrubrates); i++) {

		if (scrubrates[i].scrubval == scrubval) {

			*bw = scrubrates[i].bandwidth;

			status = 0;