From: Hanjun Guo <guohanjun@huawei.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Doug Smythies <dsmythies@telus.net>
Cc: <linux-pm@vger.kernel.org>, Jonathan Corbet <corbet@lwn.net>,
Hanjun Guo <guohanjun@huawei.com>
Subject: [PATCH 1/6] cpuidle: sysfs: Fix the overlap for showing available governors
Date: Tue, 19 May 2020 14:25:20 +0800 [thread overview]
Message-ID: <1589869525-29893-2-git-send-email-guohanjun@huawei.com> (raw)
In-Reply-To: <1589869525-29893-1-git-send-email-guohanjun@huawei.com>
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>
---
drivers/cpuidle/sysfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index d3ef1d7..477b05a 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -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:
--
1.7.12.4
next prev parent reply other threads:[~2020-05-19 6:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 6:25 [PATCH 0/6] cpuidle: Make cpuidle governor switchable to be the default behaviour Hanjun Guo
2020-05-19 6:25 ` Hanjun Guo [this message]
2020-05-19 15:43 ` [PATCH 1/6] cpuidle: sysfs: Fix the overlap for showing available governors Rafael J. Wysocki
2020-05-19 6:25 ` [PATCH 2/6] cpuidle: sysfs: Accept governor name with 15 characters Hanjun Guo
2020-05-19 6:25 ` [PATCH 3/6] cpuidle: Make cpuidle governor switchable to be the default behaviour Hanjun Guo
2020-05-19 6:25 ` [PATCH 4/6] cpuidle: sysfs: Remove sysfs_switch and switch attributes Hanjun Guo
2020-05-19 6:25 ` [PATCH 5/6] Documentation: cpuidle: update the document Hanjun Guo
2020-05-19 6:25 ` [PATCH 6/6] Documentation: ABI: make current_governer_ro as a candidate for removal Hanjun Guo
2020-05-19 6:53 ` [PATCH 0/6] cpuidle: Make cpuidle governor switchable to be the default behaviour Hanjun Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589869525-29893-2-git-send-email-guohanjun@huawei.com \
--to=guohanjun@huawei.com \
--cc=corbet@lwn.net \
--cc=daniel.lezcano@linaro.org \
--cc=dsmythies@telus.net \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).