Merge ~rathore4u/ubuntu/+source/linux/+git/version-seeds:LP2069534-140-char-fix into ~ubuntu-kernel/ubuntu/+source/linux/+git/noble:master

[Shantur Rathore]

Unmerged commits

a16c19a... by Shantur Rathore <email address hidden> on 2024-06-19

LP2069534 - ARM64 doesn't boot if command line param is more than 140 chars

The bug was introduced in v6.8-rc1 with the commit reverted below.
It got fixed with Mini C runtime in v6.9-rc1. For now in v6.8 revert the
commit to fix the issue.

Revert "arm64: idreg-override: Avoid parameq() and parameqn()"

This reverts commit dc3f5aae06381b43bc9d0d416bd15ee1682940e9.

diff --git a/arch/arm64/kernel/idreg-override.c b/arch/arm64/kernel/idreg-override.c
index e30fd9e..c2ea804 100644
--- a/arch/arm64/kernel/idreg-override.c
+++ b/arch/arm64/kernel/idreg-override.c
@@ -185,8 +185,8 @@ static const struct {
 	char	alias[FTR_ALIAS_NAME_LEN];
 	char	feature[FTR_ALIAS_OPTION_LEN];
 } aliases[] __initconst = {
-	{ "kvm_arm.mode=nvhe",		"id_aa64mmfr1.vh=0" },
-	{ "kvm_arm.mode=protected",	"id_aa64mmfr1.vh=0" },
+	{ "kvm-arm.mode=nvhe",		"id_aa64mmfr1.vh=0" },
+	{ "kvm-arm.mode=protected",	"id_aa64mmfr1.vh=0" },
 	{ "arm64.nosve",		"id_aa64pfr0.sve=0" },
 	{ "arm64.nosme",		"id_aa64pfr1.sme=0" },
 	{ "arm64.nobti",		"id_aa64pfr1.bt=0" },
@@ -223,7 +223,7 @@ static int __init find_field(const char *cmdline, char *opt, int len,
 	len += flen;
 	opt[len++] = '=';
 
-	if (memcmp(cmdline, opt, len))
+	if (!parameqn(cmdline, opt, len))
 		return -1;
 
 	return parse_hexdigit(cmdline + len, v);
@@ -286,29 +286,23 @@ static __init void __parse_cmdline(const char *cmdline, bool parse_aliases)
 
 		cmdline = skip_spaces(cmdline);
 
-		/* terminate on "--" appearing on the command line by itself */
-		if (cmdline[0] == '-' && cmdline[1] == '-' && isspace(cmdline[2]))
-			return;
-
-		for (len = 0; cmdline[len] && !isspace(cmdline[len]); len++) {
-			if (len >= sizeof(buf) - 1)
-				break;
-			if (cmdline[len] == '-')
-				buf[len] = '_';
-			else
-				buf[len] = cmdline[len];
-		}
+		for (len = 0; cmdline[len] && !isspace(cmdline[len]); len++);
 		if (!len)
 			return;
 
-		buf[len] = 0;
+		len = min(len, ARRAY_SIZE(buf) - 1);
+		memcpy(buf, cmdline, len);
+		buf[len] = '\0';
+
+		if (strcmp(buf, "--") == 0)
+			return;
 
 		cmdline += len;
 
 		match_options(buf);
 
 		for (i = 0; parse_aliases && i < ARRAY_SIZE(aliases); i++)
-			if (!memcmp(buf, aliases[i].alias, len + 1))
+			if (parameq(buf, aliases[i].alias))
 				__parse_cmdline(aliases[i].feature, false);
 	} while (1);
 }