Skip to contentSkip to conversation

Patch "ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions" has been added to the 5.15-stable tree

PATCH [email protected] 1 participant 1 message Mar 5, 2022 Arm (32-bit)

lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions

to the 5.15-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:

     arm-9182-1-mmu-fix-returns-from-early_param-and-__setup-functions.patch

and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 7b83299e5b9385943a857d59e15cba270df20d7e Mon Sep 17 00:00:00 2001
From: Randy Dunlap <[email protected]>
Date: Wed, 23 Feb 2022 20:46:35 +0100
Subject: ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Randy Dunlap <[email protected]>

commit 7b83299e5b9385943a857d59e15cba270df20d7e upstream.

early_param() handlers should return 0 on success. __setup() handlers should return 1 on success, i.e., the parameter has been handled. A return of 0 would cause the "option=value" string to be added to init's environment strings, polluting it.

../arch/arm/mm/mmu.c: In function 'test_early_cachepolicy':
../arch/arm/mm/mmu.c:215:1: error: no return statement in function returning non-void [-Werror=return-type] ../arch/arm/mm/mmu.c: In function 'test_noalign_setup':
../arch/arm/mm/mmu.c:221:1: error: no return statement in function returning non-void [-Werror=return-type]

Fixes b849a60e0903 ("ARM: make cr_alignment read-only #ifndef CONFIG_CPU_CP15")
Cc Uwe Kleine-König <[email protected]>
---
 arch/arm/mm/mmu.c |    2 ++
 1 file changed, 2 insertions(+)
arch/arm/mm/mmu.c +2 -0
@@ -212,12 +212,14 @@ early_param("ecc", early_ecc);
 static int __init early_cachepolicy(char *p)
 {
 	pr_warn("cachepolicy kernel parameter not supported without cp15\n");
+	return 0;
 }
 early_param("cachepolicy", early_cachepolicy);
 
 static int __init noalign_setup(char *__unused)
 {
 	pr_warn("noalign kernel parameter not supported without cp15\n");
+	return 1;
 }
 __setup("noalign", noalign_setup);
 

Patches currently in stable-queue which might be from [email protected] are

queue-5.15/arm-9182-1-mmu-fix-returns-from-early_param-and-__setup-functions.patch queue-5.15/iwlwifi-mvm-check-debugfs_dir-ptr-before-use.patch queue-5.15/net-stmmac-fix-return-value-of-__setup-handler.patch queue-5.15/pci-rcar-check-if-device-is-runtime-suspended-instea.patch queue-5.15/mips-setup-fix-setnocoherentio-boolean-setting.patch queue-5.15/net-sxgbe-fix-return-value-of-__setup-handler.patch

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel