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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9E7FBC433F5 for ; Wed, 15 Dec 2021 14:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:From:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=NHlfEktF1Ybz7WVuDlNa2Oa2gy220h4nj1tDd/KtzNw=; b=38Jhe12Z9UOgCo /+AI6O/90Agp9IJCwuSvZdY5UUpv3Lmz4Sfeyht/lZwQltUnJbi0i9lXRndPUb7kcy5bc2n2FSu9J PEyQMDLM5kEXxblGHfhSOI1u+d5GnTEz4M8OyT4mWZEQoNYEorO2WL1WknF4BVyLg8FosEtCrub30 uk2itTNv69AJSIeZQFINh+btupawIkv0lWa5RCVRQ+k4izkHALlCasTwB1yR8s7XQdB9pCttb9HZf fnxy0Z4OTGJB6yyM5I91Xd0OT4cqb7Fu19OTXVZlXJExLzatMkVD/lfKHPQaxd/QAWCVEummqpt3v 5nXDQAjBtBpo1nXDLxAA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxV0S-0013DA-CK; Wed, 15 Dec 2021 14:11:44 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mxUzD-0012gD-Gq for linux-arm-kernel@lists.infradead.org; Wed, 15 Dec 2021 14:10:29 +0000 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 7E273618CF; Wed, 15 Dec 2021 14:10:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6243EC34605; Wed, 15 Dec 2021 14:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1639577424; bh=vCOVj0sOe453y1b5oBgviCkuI5qU25SbPIP07fFUrLk=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=XPUIgoLQJdh+NXV6fXBfOKuGjpNVAYAnWUajPA6+KJBxVwQ7VJtJaLBWyPJugFuh3 hlOUhO2Uxgbl8/nOEqy/tdbzzaBaipRT+Xeh/iiy56ac+jY/tQFG6EaRq+v1NFO7p3 mynTSYp/GyBTi8mXbRXV565hjxiA8VJu1IQw1NPg= Subject: Patch "memblock: ensure there is no overflow in memblock_overlaps_region()" has been added to the 5.10-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:10:10 +0100 In-Reply-To: <20211213094135.1798-4-mark-pk.tsai@mediatek.com> Message-ID: <16395774105643@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211215_061027_718021_FF4CC207 X-CRM114-Status: GOOD ( 15.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: memblock-ensure-there-is-no-overflow-in-memblock_overlaps_region.patch and it can be found in the queue-5.10 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:01:20 PM CET 2021 From: Mark-PK Tsai Date: Mon, 13 Dec 2021 17:41:33 +0800 Subject: memblock: ensure there is no overflow in memblock_overlaps_region() To: Cc: , , , , , , , , , , Message-ID: <20211213094135.1798-4-mark-pk.tsai@mediatek.com> From: Mike Rapoport [ Upstream commit 023accf5cdc1e504a9b04187ec23ff156fe53d90 ] There maybe an overflow in memblock_overlaps_region() if it is called with 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 @@ -182,6 +182,8 @@ bool __init_memblock memblock_overlaps_r { unsigned long i; + memblock_cap_size(base, &size); + for (i = 0; i < type->cnt; i++) if (memblock_addrs_overlap(base, size, type->regions[i].base, type->regions[i].size)) @@ -1792,7 +1794,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); } Patches currently in stable-queue which might be from mark-pk.tsai@mediatek.com are queue-5.10/arm-extend-pfn_valid-to-take-into-account-freed-memory-map-alignment.patch queue-5.10/arm-ioremap-don-t-abuse-pfn_valid-to-check-if-pfn-is-in-ram.patch queue-5.10/memblock-free_unused_memmap-use-pageblock-units-instead-of-max_order.patch queue-5.10/memblock-align-freed-memory-map-on-pageblock-boundaries-with-sparsemem.patch queue-5.10/memblock-ensure-there-is-no-overflow-in-memblock_overlaps_region.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 8E7E5C433EF for ; Wed, 15 Dec 2021 14:14:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0ECBF6B0081; Wed, 15 Dec 2021 09:10:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0C4CD6B0080; Wed, 15 Dec 2021 09:10:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECD536B0081; Wed, 15 Dec 2021 09:10:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0052.hostedemail.com [216.40.44.52]) by kanga.kvack.org (Postfix) with ESMTP id DF4B46B007E for ; Wed, 15 Dec 2021 09:10:36 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id AAD0386992 for ; Wed, 15 Dec 2021 14:10:26 +0000 (UTC) X-FDA: 78920213652.19.FB46233 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id DD5F640019 for ; Wed, 15 Dec 2021 14:10:25 +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 7E273618CF; Wed, 15 Dec 2021 14:10:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6243EC34605; Wed, 15 Dec 2021 14:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1639577424; bh=vCOVj0sOe453y1b5oBgviCkuI5qU25SbPIP07fFUrLk=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=XPUIgoLQJdh+NXV6fXBfOKuGjpNVAYAnWUajPA6+KJBxVwQ7VJtJaLBWyPJugFuh3 hlOUhO2Uxgbl8/nOEqy/tdbzzaBaipRT+Xeh/iiy56ac+jY/tQFG6EaRq+v1NFO7p3 mynTSYp/GyBTi8mXbRXV565hjxiA8VJu1IQw1NPg= Subject: Patch "memblock: ensure there is no overflow in memblock_overlaps_region()" has been added to the 5.10-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:10:10 +0100 In-Reply-To: <20211213094135.1798-4-mark-pk.tsai@mediatek.com> Message-ID: <16395774105643@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: rspam05 X-Rspamd-Queue-Id: DD5F640019 X-Stat-Signature: 7qkocmj8bf5x5faaknirxwoxin8ormpc Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=XPUIgoLQ; spf=pass (imf27.hostedemail.com: domain of gregkh@linuxfoundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org X-HE-Tag: 1639577425-687725 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.10-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.10 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:01:20 PM CET 2021 From: Mark-PK Tsai Date: Mon, 13 Dec 2021 17:41:33 +0800 Subject: memblock: ensure there is no overflow in memblock_overlaps_regio= n() To: Cc: , , , , , = , , , , , Message-ID: <20211213094135.1798-4-mark-pk.tsai@mediatek.com> From: Mike Rapoport [ Upstream commit 023accf5cdc1e504a9b04187ec23ff156fe53d90 ] 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 @@ -182,6 +182,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)) @@ -1792,7 +1794,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.10/arm-extend-pfn_valid-to-take-into-account-freed-memory-map-ali= gnment.patch queue-5.10/arm-ioremap-don-t-abuse-pfn_valid-to-check-if-pfn-is-in-ram.pa= tch queue-5.10/memblock-free_unused_memmap-use-pageblock-units-instead-of-max= _order.patch queue-5.10/memblock-align-freed-memory-map-on-pageblock-boundaries-with-s= parsemem.patch queue-5.10/memblock-ensure-there-is-no-overflow-in-memblock_overlaps_regi= on.patch