diff mbox series

arm64: mte: Fix the stack frame size warning in mte_dump_tag_range()

Message ID 20220401151356.1674232-1-catalin.marinas@arm.com (mailing list archive)
State New, archived
Headers show
Series arm64: mte: Fix the stack frame size warning in mte_dump_tag_range() | expand

Commit Message

Catalin Marinas April 1, 2022, 3:13 p.m. UTC
With 64K page configurations, the tags array stored on the stack of the
mte_dump_tag_range() function is 2048 bytes, triggering a compiler
warning when CONFIG_FRAME_WARN is enabled. Switch to a kmalloc()
allocation via mte_allocate_tag_storage().

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Fixes: 6dd8b1a0b6cb ("arm64: mte: Dump the MTE tags in the core file")
Reported-by: kernel test robot <lkp@intel.com>
Cc: Will Deacon <will@kernel.org>
---
 arch/arm64/kernel/elfcore.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

Comments

Will Deacon April 4, 2022, 10:10 a.m. UTC | #1
On Fri, 1 Apr 2022 16:13:56 +0100, Catalin Marinas wrote:
> With 64K page configurations, the tags array stored on the stack of the
> mte_dump_tag_range() function is 2048 bytes, triggering a compiler
> warning when CONFIG_FRAME_WARN is enabled. Switch to a kmalloc()
> allocation via mte_allocate_tag_storage().
> 
> 

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: mte: Fix the stack frame size warning in mte_dump_tag_range()
      https://git.kernel.org/arm64/c/16decce22efa

Cheers,
diff mbox series

Patch

diff --git a/arch/arm64/kernel/elfcore.c b/arch/arm64/kernel/elfcore.c
index 3ed39c61a510..b773a37247a0 100644
--- a/arch/arm64/kernel/elfcore.c
+++ b/arch/arm64/kernel/elfcore.c
@@ -32,10 +32,11 @@  static unsigned long mte_vma_tag_dump_size(struct vm_area_struct *vma)
 static int mte_dump_tag_range(struct coredump_params *cprm,
 			      unsigned long start, unsigned long end)
 {
+	int ret = 1;
 	unsigned long addr;
+	void *tags = NULL;
 
 	for (addr = start; addr < end; addr += PAGE_SIZE) {
-		char tags[MTE_PAGE_TAG_STORAGE];
 		struct page *page = get_dump_page(addr);
 
 		/*
@@ -59,13 +60,28 @@  static int mte_dump_tag_range(struct coredump_params *cprm,
 			continue;
 		}
 
+		if (!tags) {
+			tags = mte_allocate_tag_storage();
+			if (!tags) {
+				put_page(page);
+				ret = 0;
+				break;
+			}
+		}
+
 		mte_save_page_tags(page_address(page), tags);
 		put_page(page);
-		if (!dump_emit(cprm, tags, MTE_PAGE_TAG_STORAGE))
-			return 0;
+		if (!dump_emit(cprm, tags, MTE_PAGE_TAG_STORAGE)) {
+			mte_free_tag_storage(tags);
+			ret = 0;
+			break;
+		}
 	}
 
-	return 1;
+	if (tags)
+		mte_free_tag_storage(tags);
+
+	return ret;
 }
 
 Elf_Half elf_core_extra_phdrs(void)