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

Commit 144d80be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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[]
parents cbb525b4 168bfeef

drivers/edac/amd64_edac.c

+4 −7
Original line number Diff line number Diff line
@@ -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

	 * bandwidth entry that is greater or equal than the setting requested

	 * 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

		 * (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)

			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;