Linux Power Management development
 help / color / mirror / Atom feed
From: Yi Yang <yiyang13@huawei.com>
To: <rafael@kernel.org>, <viresh.kumar@linaro.org>
Cc: <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<yiyang13@huawei.com>
Subject: [PATCH -next] cpufreq: Fix reserved space in cpufreq_show_cpus()
Date: Sat, 21 May 2022 14:35:34 +0800	[thread overview]
Message-ID: <20220521063534.138930-1-yiyang13@huawei.com> (raw)

Function scnprintf() would reserve space for the trailing '\0' and return 
value is the number of characters written into buf not including the 
trailing '\0'. internally meaning the next scnprintf() would write begin 
the trailing '\0'. The code specifying "PAGE_SIZE - i - 2" here is trying 
to reserve space for "\n\0" which would cause scnprintf() to reserve an 
additional byte making the tail of the buf looks like this: "\n\0\0". 
Thus. we should reserve only the space for one '\0'. passing in 
"PAGE_SIZE - i - 1".

Additionally, each iteration would replace the trailing '\0' from the last 
iteration with a space, and append 4 additional bytes to the string making 
it a total of 5 additional bytes. That means we should stop printing into 
the buffer if the remaining size is less than 7 bytes(1 for the ' ', 4 for 
the %u and 2 for the tailing "\n\0")

Signed-off-by: Yi Yang <yiyang13@huawei.com>
---
 drivers/cpufreq/cpufreq.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 1f6667ce43bd..60c005c9961e 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -844,9 +844,9 @@ ssize_t cpufreq_show_cpus(const struct cpumask *mask, char *buf)
 
 	for_each_cpu(cpu, mask) {
 		if (i)
-			i += scnprintf(&buf[i], (PAGE_SIZE - i - 2), " ");
-		i += scnprintf(&buf[i], (PAGE_SIZE - i - 2), "%u", cpu);
-		if (i >= (PAGE_SIZE - 5))
+			i += scnprintf(&buf[i], (PAGE_SIZE - i - 1), " ");
+		i += scnprintf(&buf[i], (PAGE_SIZE - i - 1), "%u", cpu);
+		if (i >= (PAGE_SIZE - 6))
 			break;
 	}
 	i += sprintf(&buf[i], "\n");
-- 
2.17.1


             reply	other threads:[~2022-05-21  6:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-21  6:35 Yi Yang [this message]
2022-05-24  7:10 ` [PATCH -next] cpufreq: Fix reserved space in cpufreq_show_cpus() Viresh Kumar
2022-06-14 13:37   ` Rafael J. Wysocki
2022-06-14 13:48     ` Rafael J. Wysocki
2022-06-15  4:56       ` Viresh Kumar
2022-06-18 10:32         ` yiyang (D)
2022-06-20  4:24           ` Viresh Kumar

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=20220521063534.138930-1-yiyang13@huawei.com \
    --to=yiyang13@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rafael@kernel.org \
    --cc=viresh.kumar@linaro.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