From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2252C433EF for ; Thu, 16 Jun 2022 16:18:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8B2386B0082; Thu, 16 Jun 2022 12:17:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8619D6B0083; Thu, 16 Jun 2022 12:17:58 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72E596B0087; Thu, 16 Jun 2022 12:17:58 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 61E376B0082 for ; Thu, 16 Jun 2022 12:17:58 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 335E724A for ; Thu, 16 Jun 2022 16:17:58 +0000 (UTC) X-FDA: 79584605436.16.3302B66 Received: from out30-45.freemail.mail.aliyun.com (out30-45.freemail.mail.aliyun.com [115.124.30.45]) by imf08.hostedemail.com (Postfix) with ESMTP id D6A3916008D for ; Thu, 16 Jun 2022 16:17:56 +0000 (UTC) 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=ay29a033018046051;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=12;SR=0;TI=SMTPD_---0VGaoY40_1655396270; Received: from localhost(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VGaoY40_1655396270) by smtp.aliyun-inc.com; Fri, 17 Jun 2022 00:17:51 +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 4.19] mm: page_alloc: validate buddy page before using Date: Fri, 17 Jun 2022 00:17:42 +0800 Message-Id: <20220616161746.3565225-3-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> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655396277; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=scSJ7I0flhtCSUWDBJBxoGuqmis7qz8Wui6mKfX7mus=; b=Flj7a0koTmIx9KCyYLQonyPh33o/iF+aqHRtCLnIXSpQgVTddeVIQ5GThAzlKhLRHhY94b sjpe2GgSaRSAjZgZFkDpkBOJSUMzsN6PQmTQH6FQ6jxtFC5hYLfXUDs4bNtqqWfA7cT9vI 05AcsnwzF3GjZcXQd7pUXW90hizC6WU= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of xianting.tian@linux.alibaba.com designates 115.124.30.45 as permitted sender) smtp.mailfrom=xianting.tian@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655396277; a=rsa-sha256; cv=none; b=Vn+8Q1OvXuIBMHzokyaRM0fIizgXKmGBD2XDabNmChCaCSbP9L5OK+77+B+Sg6UU0x20m2 Ur7meMfInJXV9bn6xIR0TXau8YcMi3RhFwt84akJJj8JYQ/HYJIDi8sW21+Zq9XSHjKUdV +dVzjc9oyfJPuNV9zIGNtIKo0DNGJ5E= X-Stat-Signature: 9hz1hipge6qtrix8tnd4pjnxahguu475 X-Rspamd-Queue-Id: D6A3916008D X-Rspamd-Server: rspam11 X-Rspam-User: Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of xianting.tian@linux.alibaba.com designates 115.124.30.45 as permitted sender) smtp.mailfrom=xianting.tian@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-HE-Tag: 1655396276-83699 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Commit 787af64d05cd ("mm: page_alloc: validate buddy before check its migratetype.") 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 opensbi, so it would have pfn_base=512 and mem_map began with 512th PFN when CONFIG_FLATMEM=y. 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 other 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 9c35403d9646..8fc7f1803976 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -858,6 +858,9 @@ static inline void __free_one_page(struct page *page, buddy_pfn = __find_buddy_pfn(pfn, order); buddy = page + (buddy_pfn - pfn); + + if (!page_is_buddy(page, buddy, order)) + goto done_merging; buddy_mt = get_pageblock_migratetype(buddy); if (migratetype != buddy_mt -- 2.17.1