From: Randy Dunlap <rdunlap@infradead.org>
To: linux-kernel@vger.kernel.org
Cc: "Randy Dunlap" <rdunlap@infradead.org>,
"Jens Axboe" <axboe@kernel.dk>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Toralf Förster" <toralf.foerster@gmx.de>,
linux-mm@kvack.org
Subject: [RFC PATCH 1/2] log2: handle LARGE input to __roundup_pow_of_two()
Date: Sun, 20 Dec 2020 13:10:37 -0800 [thread overview]
Message-ID: <20201220211037.1354-1-rdunlap@infradead.org> (raw)
UBSAN detected a 64-bit shift in log2.h:__roundup_pow_of_two():
UBSAN: shift-out-of-bounds in ./include/linux/log2.h:57:13
shift exponent 64 is too large for 64-bit type 'long unsigned int'
This is during a call from mm/readahead.c:ondemand_readahead(),
get_init_ra_size(), where the 'size' parameter must have been
extremely large (or "negative").
fls() can legitimately return 32 or 64 when the MSbit is set in
a 32-bit or 64-bit unsigned long. For these values, doing
"1UL << shiftcout" is invalid or undefined, so catch when this
happens.
When the MSbit is 32 or 64, we cannot roundup to the next power of 2,
so just return n (the input value), which is >= 0x8000...0000 and
probably not a power of 2 (unless it is exactly 0x8000...0000).
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Toralf Förster <toralf.foerster@gmx.de>
Cc: linux-mm@kvack.org
---
include/linux/log2.h | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
--- linux-5.10.1.orig/include/linux/log2.h
+++ linux-5.10.1/include/linux/log2.h
@@ -54,7 +54,17 @@ bool is_power_of_2(unsigned long n)
static inline __attribute__((const))
unsigned long __roundup_pow_of_two(unsigned long n)
{
- return 1UL << fls_long(n - 1);
+ unsigned int lastset = fls_long(n - 1); /* this can be 64 or 32 */
+
+ /*
+ * for high bit set (64 or 32), we can neither round up nor
+ * make it a power or 2
+ */
+ if ((sizeof(n) == 4 && lastset == 32) ||
+ (sizeof(n) == 8 && lastset == 64))
+ return n;
+
+ return 1UL << lastset;
}
/**
next reply other threads:[~2020-12-20 21:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-20 21:10 Randy Dunlap [this message]
2020-12-20 21:23 ` [RFC PATCH 1/2] log2: handle LARGE input to __roundup_pow_of_two() Matthew Wilcox
2020-12-20 22:19 ` Randy Dunlap
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=20201220211037.1354-1-rdunlap@infradead.org \
--to=rdunlap@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=toralf.foerster@gmx.de \
/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).