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 A6077C433F5 for ; Wed, 15 Dec 2021 14:11:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3849D6B0074; Wed, 15 Dec 2021 09:10:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 334F46B0075; Wed, 15 Dec 2021 09:10:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1ADEA6B0078; Wed, 15 Dec 2021 09:10:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0157.hostedemail.com [216.40.44.157]) by kanga.kvack.org (Postfix) with ESMTP id 0D8F36B0074 for ; Wed, 15 Dec 2021 09:10:21 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id D1A60181AEF0B for ; Wed, 15 Dec 2021 14:10:10 +0000 (UTC) X-FDA: 78920213022.06.0270149 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf23.hostedemail.com (Postfix) with ESMTP id 4F45E140007 for ; Wed, 15 Dec 2021 14:10:06 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 55B71618E6; Wed, 15 Dec 2021 14:10:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A79BC34605; Wed, 15 Dec 2021 14:10:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1639577408; bh=G1MpFqfTYge/mhyeTU9h9cay0nTRXqRE52+EEsiltBQ=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=p1jDc0A6ndUeuTSiciZ5/JTt4Q0TK0O55Jr0nQU11SMY81rHZ8QIf3TK4eFxRaXfX 8nRy7HOtPxF3vArlRc6JpsMFdfsHj84Ay+a/Tg0XWB7POi6GaMb69dtkp+CjMdZnEO Tej7PR+f6YnBdiaAwWyNswZT1U052kUcV2uwjhHM= Subject: Patch "memblock: ensure there is no overflow in memblock_overlaps_region()" has been added to the 5.4-stable tree To: akpm@linux-foundation.org,gregkh@linuxfoundation.org,linux-arm-kernel@lists.infradead.org,linux-mm@kvack.org,linux@armlinux.org.uk,mark-pk.tsai@mediatek.com,rppt@kernel.org,rppt@linux.ibm.com,tony@atomide.com,wangkefeng.wang@huawei.com,yj.chiang@mediatek.com Cc: From: Date: Wed, 15 Dec 2021 15:09:52 +0100 In-Reply-To: <20211213085710.28962-4-mark-pk.tsai@mediatek.com> Message-ID: <163957739216985@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 X-stable: commit X-Patchwork-Hint: ignore X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 4F45E140007 X-Stat-Signature: xa77ookow3dgus8xke563wdeib4kxs89 Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=p1jDc0A6; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf23.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-HE-Tag: 1639577406-659996 Content-Transfer-Encoding: quoted-printable 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: This is a note to let you know that I've just added the patch titled memblock: ensure there is no overflow in memblock_overlaps_region() to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.g= it;a=3Dsummary The filename of the patch is: memblock-ensure-there-is-no-overflow-in-memblock_overlaps_region.pat= ch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Wed Dec 15 03:02:39 PM CET 2021 From: Mark-PK Tsai Date: Mon, 13 Dec 2021 16:57:08 +0800 Subject: memblock: ensure there is no overflow in memblock_overlaps_regio= n() To: Cc: , , , , , = , , , , , Message-ID: <20211213085710.28962-4-mark-pk.tsai@mediatek.com> From: Mike Rapoport commit 023accf5cdc1e504a9b04187ec23ff156fe53d90 upstream. There maybe an overflow in memblock_overlaps_region() if it is called wit= h base and size such that base + size > PHYS_ADDR_MAX Make sure that memblock_overlaps_region() caps the size to prevent such overflow and remove now duplicated call to memblock_cap_size() from memblock_is_region_reserved(). Signed-off-by: Mike Rapoport Tested-by: Tony Lindgren Link: https://lore.kernel.org/lkml/20210630071211.21011-1-rppt@kernel.org= / Signed-off-by: Mark-PK Tsai Signed-off-by: Greg Kroah-Hartman --- mm/memblock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/memblock.c +++ b/mm/memblock.c @@ -164,6 +164,8 @@ bool __init_memblock memblock_overlaps_r { unsigned long i; =20 + memblock_cap_size(base, &size); + for (i =3D 0; i < type->cnt; i++) if (memblock_addrs_overlap(base, size, type->regions[i].base, type->regions[i].size)) @@ -1760,7 +1762,6 @@ bool __init_memblock memblock_is_region_ */ bool __init_memblock memblock_is_region_reserved(phys_addr_t base, phys_= addr_t size) { - memblock_cap_size(base, &size); return memblock_overlaps_region(&memblock.reserved, base, size); } =20 Patches currently in stable-queue which might be from mark-pk.tsai@mediat= ek.com are queue-5.4/arm-extend-pfn_valid-to-take-into-account-freed-memory-map-alig= nment.patch queue-5.4/arm-ioremap-don-t-abuse-pfn_valid-to-check-if-pfn-is-in-ram.pat= ch queue-5.4/memblock-free_unused_memmap-use-pageblock-units-instead-of-max_= order.patch queue-5.4/memblock-align-freed-memory-map-on-pageblock-boundaries-with-sp= arsemem.patch queue-5.4/memblock-ensure-there-is-no-overflow-in-memblock_overlaps_regio= n.patch