Commit 3f9f8daa authored May 19, 2020 by Hanjun Guo Committed by Rafael J. Wysocki May 19, 2020

cpuidle: sysfs: Fix the overlap for showing available governors



When showing the available governors, it's "%s " in scnprintf(),
not "%s", so if the governor name has 15 characters, it will
overlap with the later one, fix it by adding one more for the
size.

While we are at it, fix the minor coding style issue and remove
the "/sizeof(char)" since sizeof(char) always equals 1.

Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Doug Smythies <dsmythies@telus.net>
Tested-by: Doug Smythies <dsmythies@telus.net>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 8b7ce5e4

drivers/cpuidle/sysfs.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -35,10 +35,10 @@ static ssize_t show_available_governors(struct device *dev,

		mutex_lock(&cpuidle_lock);
		list_for_each_entry(tmp, &cpuidle_governors, governor_list) {
		if (i >= (ssize_t) ((PAGE_SIZE/sizeof(char)) -
		CPUIDLE_NAME_LEN - 2))
		if (i >= (ssize_t) (PAGE_SIZE - (CPUIDLE_NAME_LEN + 2)))
		goto out;
		i += scnprintf(&buf[i], CPUIDLE_NAME_LEN, "%s ", tmp->name);

		i += scnprintf(&buf[i], CPUIDLE_NAME_LEN + 1, "%s ", tmp->name);
		}

		out:

Admin message