lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'edac_scrubrates_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

Browse Source 
Pull amd64_edac fix from Borislav Petkov:
 "An array out-of-bounds fix from Andrew when setting the scrub rate of
  the memory controller."

* tag 'edac_scrubrates_fix' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  amd64_edac:__amd64_set_scrub_rate(): avoid overindexing scrubrates[]
This commit is contained in:
Linus Torvalds
2012-10-24 16:36:36 -07:00
parent cbb525b447 168bfeef7b
commit 144d80bed9
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/edac/amd64_edac.c
View File

@@ -170,8 +170,11 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)
* memory controller and apply to register. Search for the first * memory controller and apply to register. Search for the first
* bandwidth entry that is greater or equal than the setting requested * bandwidth entry that is greater or equal than the setting requested
* and program that. If at last entry, turn off DRAM scrubbing. * and program that. If at last entry, turn off DRAM scrubbing.
*
* If no suitable bandwidth is found, turn off DRAM scrubbing entirely
* by falling back to the last element in scrubrates[].
*/ */
for (i = 0; i < ARRAY_SIZE(scrubrates); i++) { for (i = 0; i < ARRAY_SIZE(scrubrates) - 1; i++) {
/* /*
* skip scrub rates which aren't recommended * skip scrub rates which aren't recommended
* (see F10 BKDG, F3x58) * (see F10 BKDG, F3x58)
@@ -181,12 +184,6 @@ static int __amd64_set_scrub_rate(struct pci_dev *ctl, u32 new_bw, u32 min_rate)
if (scrubrates[i].bandwidth <= new_bw) if (scrubrates[i].bandwidth <= new_bw)
break; break;
/*
* if no suitable bandwidth found, turn off DRAM scrubbing
* entirely by falling back to the last element in the
* scrubrates array.
*/
} }
scrubval = scrubrates[i].scrubval; scrubval = scrubrates[i].scrubval;