Skip to content

Commit d1366e7

Browse files
Liu Shixinakpm00
authored andcommitted
mm/compaction: fix UBSAN shift-out-of-bounds warning
syzkaller reported a UBSAN shift-out-of-bounds warning of (1UL << order) in isolate_freepages_block(). The bogus compound_order can be any value because it is union with flags. Add back the MAX_PAGE_ORDER check to fix the warning. Link: https://lkml.kernel.org/r/[email protected] Fixes: 3da0272 ("mm/compaction: correctly return failure with bogus compound_order in strict mode") Signed-off-by: Liu Shixin <[email protected]> Reviewed-by: Kemeng Shi <[email protected]> Acked-by: David Hildenbrand <[email protected]> Reviewed-by: Oscar Salvador <[email protected]> Cc: Baolin Wang <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Kemeng Shi <[email protected]> Cc: Matthew Wilcox <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Nanyong Sun <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 502269a commit d1366e7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mm/compaction.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,8 @@ static unsigned long isolate_freepages_block(struct compact_control *cc,
631631
if (PageCompound(page)) {
632632
const unsigned int order = compound_order(page);
633633

634-
if (blockpfn + (1UL << order) <= end_pfn) {
634+
if ((order <= MAX_PAGE_ORDER) &&
635+
(blockpfn + (1UL << order) <= end_pfn)) {
635636
blockpfn += (1UL << order) - 1;
636637
page += (1UL << order) - 1;
637638
nr_scanned += (1UL << order) - 1;

0 commit comments

Comments
 (0)