All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Rapoport <rppt@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Kefeng Wang <wangkefeng.wang@huawei.com>,
	Mike Rapoport <rppt@linux.ibm.com>,
	Mike Rapoport <rppt@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Tony Lindgren <tony@atomide.com>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v3 3/4] memblock: ensure there is no overflow in memblock_overlaps_region()
Date: Wed, 30 Jun 2021 10:12:10 +0300	[thread overview]
Message-ID: <20210630071211.21011-4-rppt@kernel.org> (raw)
In-Reply-To: <20210630071211.21011-1-rppt@kernel.org>

From: Mike Rapoport <rppt@linux.ibm.com>

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 <rppt@linux.ibm.com>
---
 mm/memblock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 2e25d69739e0..67e0e24f8cc9 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -182,6 +182,8 @@ bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
 {
 	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))
@@ -1794,7 +1796,6 @@ bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t siz
  */
 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);
 }
 
-- 
2.28.0


WARNING: multiple messages have this Message-ID (diff)
From: Mike Rapoport <rppt@kernel.org>
To: linux-arm-kernel@lists.infradead.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Kefeng Wang <wangkefeng.wang@huawei.com>,
	Mike Rapoport <rppt@linux.ibm.com>,
	Mike Rapoport <rppt@kernel.org>,
	Russell King <linux@armlinux.org.uk>,
	Tony Lindgren <tony@atomide.com>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v3 3/4] memblock: ensure there is no overflow in memblock_overlaps_region()
Date: Wed, 30 Jun 2021 10:12:10 +0300	[thread overview]
Message-ID: <20210630071211.21011-4-rppt@kernel.org> (raw)
In-Reply-To: <20210630071211.21011-1-rppt@kernel.org>

From: Mike Rapoport <rppt@linux.ibm.com>

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 <rppt@linux.ibm.com>
---
 mm/memblock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mm/memblock.c b/mm/memblock.c
index 2e25d69739e0..67e0e24f8cc9 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -182,6 +182,8 @@ bool __init_memblock memblock_overlaps_region(struct memblock_type *type,
 {
 	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))
@@ -1794,7 +1796,6 @@ bool __init_memblock memblock_is_region_memory(phys_addr_t base, phys_addr_t siz
  */
 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);
 }
 
-- 
2.28.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-06-30  7:12 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-30  7:12 [PATCH v3 0/4] memblock, arm: fixes for freeing of the memory map Mike Rapoport
2021-06-30  7:12 ` Mike Rapoport
2021-06-30  7:12 ` [PATCH v3 1/4] memblock: free_unused_memmap: use pageblock units instead of MAX_ORDER Mike Rapoport
2021-06-30  7:12   ` Mike Rapoport
2021-06-30  7:12 ` [PATCH v3 2/4] memblock: align freed memory map on pageblock boundaries with SPARSEMEM Mike Rapoport
2021-06-30  7:12   ` Mike Rapoport
2021-06-30  7:12 ` Mike Rapoport [this message]
2021-06-30  7:12   ` [PATCH v3 3/4] memblock: ensure there is no overflow in memblock_overlaps_region() Mike Rapoport
2021-06-30  7:12 ` [PATCH v3 4/4] arm: extend pfn_valid to take into account freed memory map alignment Mike Rapoport
2021-06-30  7:12   ` Mike Rapoport
2021-07-05  4:22   ` Guenter Roeck
2021-07-05  4:22     ` Guenter Roeck
2021-07-05  7:23     ` Mike Rapoport
2021-07-05  7:23       ` Mike Rapoport
2021-07-05 14:55       ` Guenter Roeck
2021-07-05 14:55         ` Guenter Roeck
2021-07-09  4:56       ` Alexey Minnekhanov
2021-07-09  4:56         ` Alexey Minnekhanov
2021-06-30  8:26 ` [PATCH v3 0/4] memblock, arm: fixes for freeing of the memory map Tony Lindgren
2021-06-30  8:26   ` Tony Lindgren
2021-11-11  7:33 ` Mark-PK Tsai
2021-11-11  7:33   ` Mark-PK Tsai
2021-11-11  9:45   ` Mike Rapoport
2021-11-11  9:45     ` Mike Rapoport

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210630071211.21011-4-rppt@kernel.org \
    --to=rppt@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux@armlinux.org.uk \
    --cc=rppt@linux.ibm.com \
    --cc=tony@atomide.com \
    --cc=wangkefeng.wang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.