linux-kernel - [PATCH v3 2/3] x86/ioremap: Clean up size calculations in xxx_is_setup

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241123114221.149383-3-bhe@redhat.com>
Date: Sat, 23 Nov 2024 19:42:20 +0800
From: Baoquan He <bhe@...hat.com>
To: mingo@...nel.org,
	thomas.lendacky@....com,
	bp@...en8.de,
	linux-kernel@...r.kernel.org
Cc: x86@...nel.org,
	Baoquan He <bhe@...hat.com>
Subject: [PATCH v3 2/3] x86/ioremap: Clean up size calculations in xxx_is_setup_data()

while *normally* we'd use the 'sizeof(*data)' pattern, this particular
size repeats a number of times and not all contexts are obvious - so
abstracting it out into a trivial define SD_SIZE looks like the proper
cleanup.

Signed-off-by: Baoquan He <bhe@...hat.com>
---
 arch/x86/mm/ioremap.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index aaf40a712b04..76be3d664e09 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -628,6 +628,7 @@ static bool memremap_is_efi_data(resource_size_t phys_addr,
 	return false;
 }
 
+#define SD_SIZE sizeof(struct setup_data)
 /*
  * Examine the physical address to determine if it is boot data by checking
  * it against the boot params setup_data chain.
@@ -647,24 +648,24 @@ static bool __ref __memremap_is_setup_data(resource_size_t phys_addr,
 			return true;
 
 		if (early)
-			data = early_memremap_decrypted(paddr, sizeof(*data));
+			data = early_memremap_decrypted(paddr, SD_SIZE);
 		else
-			data = memremap(paddr, sizeof(*data),
+			data = memremap(paddr, SD_SIZE,
 					MEMREMAP_WB | MEMREMAP_DEC);
 		if (!data) {
 			pr_warn("failed to memremap setup_data entry\n");
 			return false;
 		}
 
-		size = sizeof(*data);
+		size = SD_SIZE;
 
 		paddr_next = data->next;
 		len = data->len;
 
 		if ((phys_addr > paddr) &&
-		    (phys_addr < (paddr + sizeof(*data) + len))) {
+		    (phys_addr < (paddr + SD_SIZE + len))) {
 			if (early)
-				early_memunmap(data, sizeof(*data));
+				early_memunmap(data, SD_SIZE);
 			else
 				memunmap(data);
 			return true;
@@ -673,7 +674,7 @@ static bool __ref __memremap_is_setup_data(resource_size_t phys_addr,
 		if (data->type == SETUP_INDIRECT) {
 			size += len;
 			if (early) {
-				early_memunmap(data, sizeof(*data));
+				early_memunmap(data, SD_SIZE);
 				data = early_memremap_decrypted(paddr, size);
 			} else {
 				memunmap(data);
@@ -706,6 +707,7 @@ static bool __ref __memremap_is_setup_data(resource_size_t phys_addr,
 
 	return false;
 }
+#undef SD_SIZE
 
 static bool memremap_is_setup_data(resource_size_t phys_addr,
 				   unsigned long size)
-- 
2.41.0