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 DD477C54756 for ; Thu, 22 May 2025 03:32:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D567D6B0083; Wed, 21 May 2025 23:32:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BA8B76B008C; Wed, 21 May 2025 23:32:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FA456B008A; Wed, 21 May 2025 23:32:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4C1576B0082 for ; Wed, 21 May 2025 23:32:01 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id E757380557 for ; Thu, 22 May 2025 03:32:00 +0000 (UTC) X-FDA: 83469120000.25.98ECAB3 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf28.hostedemail.com (Postfix) with ESMTP id 13995C0003 for ; Thu, 22 May 2025 03:31:57 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf28.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747884719; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UndR1Dg85Ybbz/EMExUNUfQE8btHHHxEQVToAdx2sfc=; b=T4ET9l2tLWKbuJ5Ka3fwvAMVnkvPF3eE1M75Nb9nSIuswV4b0+cMmYNwkW6qZdMwR6kmhl +RbUyc3sLdMH4CAyONZkau8YMC639Qu5XnYMFXx3j8s169QQAZWHw4QzDDij6mESauofLM Tx6k0P8AnVkCyqmdZn5XscatQZ0r6Rc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747884719; a=rsa-sha256; cv=none; b=LknRng12tvXik8Ry5AytaBREbSrvG3wGc0MGcrGPLPO1DG75Qo/P1QsAwzkqVku02w1BWP 8HWoQYlucQEpR6ik/M8/f5P3Vo+PpHtb9gWIv4HeocPAbsE51eos1oklcOxPIiuz/wKbWN Hv0IyktQu09nTyPelz7tOwBZ2e512kM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf28.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4b2v335jgTz4f3l7q for ; Thu, 22 May 2025 11:31:27 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id D718F1A0C56 for ; Thu, 22 May 2025 11:31:52 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgC3Z3immi5okKq2Mw--.19487S5; Thu, 22 May 2025 11:31:52 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org Cc: kasong@tencent.com, bhe@redhat.com, hannes@cmpxchg.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] mm: swap: fix potensial buffer overflow in setup_clusters() Date: Thu, 22 May 2025 20:25:53 +0800 Message-Id: <20250522122554.12209-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250522122554.12209-1-shikemeng@huaweicloud.com> References: <20250522122554.12209-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgC3Z3immi5okKq2Mw--.19487S5 X-Coremail-Antispam: 1UD129KBjvJXoW7uFyrtw17JF13KFy8GryDKFg_yoW8Jw4fpF 15Kas8GF4UJr9xKr47CF1kCry3Grn5uay7KFyfAw1a9F1kWrWIgF1Dtrn0yryDKwn5JFyv 9rsrG34UuFsYvwUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUmlb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUWwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2AFwI 0_JF0_Jw1l42xK82IYc2Ij64vIr41l4c8EcI0Ec7CjxVAaw2AFwI0_JF0_Jw1l4I8I3I0E 4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rV WUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4U JbIYCTnIWIevJa73UjIFyTuYvjxUa75rDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 13995C0003 X-Stat-Signature: 85obyrfyzxgkmw1tjaab667kyuf3g65h X-Rspam-User: X-HE-Tag: 1747884717-526284 X-HE-Meta: U2FsdGVkX19AkphiWU5fISOKccCKdcH2uEXJg2b6KPwJ32GS9LtEGXSQQDhz+JK/SUYRfp8b2DY3NCWg+zEYykXGTlNP1e+8YSXDdTg4pK2rMDTNbIG2TUXQpbVh93VSKzHbB9mdS9BCAPr+5wvNznegHChzBWYWlPhQvaB+e6FoXzpqe2tGiAjeucUSlgjduHgs3RuuQ7tngXYRfp9J/SEQf1pO9dte5MbFusfAAy6p1OSdZ6W0wzGL27dylXT6ASDAzcDpNauHPyMXiYRHUSzp66bQJByhsJGfiHIP9fxdqRTiNZvYvpPM7XHEeiJW/KOw6lkiw5Q4D4nR6D1dLDOwUI9hv9+zUX4X1zY9lTq6dMkvziD8f7+SQrCDvMLUjgqj85gSFdKz5BASIWOj8pm/Ewy8rkrscgbn/Sq4AQkiPi0XNg95Kbv+NRv3rsODooShQJeDb1ix+XmOWrhv5Tg2xe5feHUFXxbSNQbmPmfpffgV/xs/ukWfo65wkMVeayAv95ugvWglLXPcmSaiYzTzxPM0T2otK6tXoeZ8fpUxQg2ESQsJDx8xNXJRPrfNwC/rl1P1S/h5ayOpKP1P3heSPQHYPWvgvcCBvJlp8CDbzl2b+ggGgImVH+7bTqKVmeIg8eV4+jDrzxSar8YcYoviOmd30wN4bI3sdFdLmve858IlaIOb4ZpbLkkFitDK+4ODbAde89AhIwlfM5I0lId0ZY4ngmFnpM9r9UrAeui69YTvD5KGu2axIuukS+N8jBMQV0gflp3WBJmMB0thio03Vp1oQVFLHbjIfHztzGZQZ3pSGtjP6Dh21yzW9UuVM3DuEZ4myNHrOXTaQEZOkT+qFhIOhJ9JJStNfBaMjLfjvYQti1ylG8vOhw7lGBMXwb4RvJhNWkegybSDkoWyMSI44rNaYo/pvbb+DbtIdLiDhgNFgjLCONkT2ts43Y4km9b7yNwhs/lMP3fsyN9 JzKmPrzJ nAbdlSauEwAA/+ZqGrktm4MyXP24L2tfpbYYOiwUxguN/YUuYWiWxt3LtiVPTCNf8Rd1JfUoPsqONy5Vp1//ntN4dY5Kmoy3gwxczUo5VUhiE8qi0/QE8cJcM+nFM2nkWMfeIFbOtiKNEYL+OPZqheQC+emu3Kox0IforOx+svXlrrMZii/Sw1i7+vZeHoFTjBPqY0ygLse1V98SCsh+IdQDEzQ== 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: List-Subscribe: List-Unsubscribe: In setup_swap_map(), we only ensure badpages are in range (0, last_page]. As maxpages might be < last_page, setup_clusters() will encounter a buffer overflow when a badpage is >= maxpages. Only call inc_cluster_info_page() for badpage which is < maxpages to fix the issue. Fixes: b843786b0bd01 ("mm: swapfile: fix SSD detection with swapfile on btrfs") Signed-off-by: Kemeng Shi --- mm/swapfile.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/swapfile.c b/mm/swapfile.c index a82f4ebefca3..63ab9f14b2c6 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -3208,9 +3208,13 @@ static struct swap_cluster_info *setup_clusters(struct swap_info_struct *si, * and the EOF part of the last cluster. */ inc_cluster_info_page(si, cluster_info, 0); - for (i = 0; i < swap_header->info.nr_badpages; i++) - inc_cluster_info_page(si, cluster_info, - swap_header->info.badpages[i]); + for (i = 0; i < swap_header->info.nr_badpages; i++) { + unsigned int page_nr = swap_header->info.badpages[i]; + + if (page_nr >= maxpages) + continue; + inc_cluster_info_page(si, cluster_info, page_nr); + } for (i = maxpages; i < round_up(maxpages, SWAPFILE_CLUSTER); i++) inc_cluster_info_page(si, cluster_info, i); -- 2.30.0