From nobody Mon Apr 27 04:52:18 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0BCCCCA47A for ; Thu, 16 Jun 2022 16:18:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376838AbiFPQSG (ORCPT ); Thu, 16 Jun 2022 12:18:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378115AbiFPQSB (ORCPT ); Thu, 16 Jun 2022 12:18:01 -0400 Received: from out199-5.us.a.mail.aliyun.com (out199-5.us.a.mail.aliyun.com [47.90.199.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B932CCA9; Thu, 16 Jun 2022 09:17:56 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0VGamj1J_1655396271; Received: from localhost(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VGamj1J_1655396271) by smtp.aliyun-inc.com; Fri, 17 Jun 2022 00:17:52 +0800 From: Xianting Tian To: akpm@linux-foundation.org, ziy@nvidia.com, gregkh@linuxfoundation.org, stable@vger.kernel.org, guoren@kernel.org Cc: huanyi.xj@alibaba-inc.com, guohanjun@huawei.com, zjb194813@alibaba-inc.com, tianhu.hh@alibaba-inc.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Xianting Tian Subject: [PATCH 5.4] mm: page_alloc: validate buddy page before using Date: Fri, 17 Jun 2022 00:17:43 +0800 Message-Id: <20220616161746.3565225-4-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220616161746.3565225-1-xianting.tian@linux.alibaba.com> References: <20220616161746.3565225-1-xianting.tian@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit 787af64d05cd ("mm: page_alloc: validate buddy before check its migra= tetype.") fixes a bug in 1dd214b8f21c and there is a similar bug in d9dddbf55667 that can be fixed in a similar way too. In addition, for RISC-V arch the first 2MB RAM could be reserved for opensb= i, so it would have pfn_base=3D512 and mem_map began with 512th PFN when CONFIG_FLATMEM=3Dy. But __find_buddy_pfn algorithm thinks the start pfn 0, it could get 0 pfn or less than the pfn_base value. We need page_is_buddy() to verify the buddy to prevent accessing an invalid buddy. Fixes: d9dddbf55667 ("mm/page_alloc: prevent merging between isolated and o= ther pageblocks") Cc: stable@vger.kernel.org Reported-by: zjb194813@alibaba-inc.com Reported-by: tianhu.hh@alibaba-inc.com Signed-off-by: Xianting Tian --- mm/page_alloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f08ce248af2a..8f56e6a193cc 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -959,6 +959,9 @@ static inline void __free_one_page(struct page *page, =20 buddy_pfn =3D __find_buddy_pfn(pfn, order); buddy =3D page + (buddy_pfn - pfn); + + if (!page_is_buddy(page, buddy, order)) + goto done_merging; buddy_mt =3D get_pageblock_migratetype(buddy); =20 if (migratetype !=3D buddy_mt --=20 2.17.1