From: Dan Carpenter <dan.carpenter@linaro.org>
To: Shuah Khan <skhan@linuxfoundation.org>
Cc: Dev Jain <dev.jain@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
Shuah Khan <shuah@kernel.org>,
linux-mm@kvack.org, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] selftests/mm: compaction_test: Fix off by one in check_compaction()
Date: Fri, 9 Aug 2024 23:01:38 +0300 [thread overview]
Message-ID: <20ad879e-689b-4b09-823c-4cb4f9b010e7@stanley.mountain> (raw)
In-Reply-To: <4c709253-50de-45ee-9cbf-8bed65eff857@linuxfoundation.org>
On Fri, Aug 09, 2024 at 11:20:48AM -0600, Shuah Khan wrote:
> On 8/9/24 06:32, Dan Carpenter wrote:
> > The "initial_nr_hugepages" variable is unsigned long so it takes up to
> > 20 characters to print, plus 1 more character for the NUL terminator.
> > Unfortunately, this buffer is not quite large enough for the terminator
> > to fit. Also use snprintf() for a belt and suspenders approach.
> >
> > Fixes: fb9293b6b015 ("selftests/mm: compaction_test: fix bogus test success and reduce probability of OOM-killer invocation")
> > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> > ---
> > tools/testing/selftests/mm/compaction_test.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c
> > index e140558e6f53..2c3a0eb6b22d 100644
> > --- a/tools/testing/selftests/mm/compaction_test.c
> > +++ b/tools/testing/selftests/mm/compaction_test.c
> > @@ -89,9 +89,10 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size,
> > int fd, ret = -1;
> > int compaction_index = 0;
> > char nr_hugepages[20] = {0};
> > - char init_nr_hugepages[20] = {0};
> > + char init_nr_hugepages[24] = {0};
>
> Can we exceed this limit too? Can you make this a define?
>
It's based on counting the digits in U64_MAX.
18446744073709551615X
123456789012345678901
We don't have any defines for that kind of thing. It's not a bad idea.
#define STRLEN_U64_MAX 20
char init_nr_hugepages[STRLEN_U64_MAX + 1];
But it should be done as part of a kernel wide clean up and not part of this
buffer overflow fix. The line above it could be changed as well, for example.
Let me create a KTODO and hope the internet will take care of it.
KTODO: create defines for STRLEN_[SU]8/16/32/64_MIN/MAX.
Btw, I rounded up to 24 just because I like buffer sizes that are divisible
by 4 but the compiler is probably going to do that automatically either way.
regards,
dan carpenter
prev parent reply other threads:[~2024-08-09 20:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-09 12:32 Dan Carpenter
2024-08-09 17:20 ` Shuah Khan
2024-08-09 20:01 ` Dan Carpenter [this message]
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=20ad879e-689b-4b09-823c-4cb4f9b010e7@stanley.mountain \
--to=dan.carpenter@linaro.org \
--cc=akpm@linux-foundation.org \
--cc=dev.jain@arm.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.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