Skip to contentSkip to conversation

s390: Warn if kernel command line contains non-printable EBCDIC characters

PATCH Superseded Ilya Leoshkevich 3 participants 3 messages Aug 26 s390

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 s390: Warn if kernel command line contains non-printable EBCDIC characters

Users may accidentally add multi-byte UTF-8 characters to zipl.conf parmline, for example, by copying snippets containing non-breaking spaces (\xC2\xA0) from web pages.

The kernel will then interpret the entire command line as EBCDIC, making it unusable. Distinguish this situation from the legitimate EBCDIC conversion by looking for non-printable characters and issue a warning.

---

v1: https://lore.kernel.org/all/[email protected]/
v1 -> v2: Account for newlines (Heiko).
Minor stylistic improvements: inline int i, bool return type, comment modality.

 arch/s390/boot/ipl_parm.c | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)
arch/s390/boot/ipl_parm.c +19 -1
index 6bc950b92be76..6ea800ed98258 100644
@@ -173,12 +173,30 @@ static inline int has_ebcdic_char(const char *str)
 	return 0;
 }
 
+static inline bool has_nonprintable_char(const char *str)
+{
+	for (int i = 0; str[i]; i++) {
+		unsigned char c = (unsigned char)str[i];
+
+		/*
+		 * Open-code ASCII range comparisons, since isprint() accepts
+		 * high Latin-1 bytes
+		 */
+		if ((c < 0x09 || c > 0x0d) && (c < 0x20 || c > 0x7e))
+			return true;
+	}
+	return false;
+}
+
 void setup_boot_command_line(void)
 {
 	parmarea.command_line[COMMAND_LINE_SIZE - 1] = 0;
 	/* convert arch command line to ascii if necessary */
-	if (has_ebcdic_char(parmarea.command_line))
+	if (has_ebcdic_char(parmarea.command_line)) {
 		EBCASC(parmarea.command_line, COMMAND_LINE_SIZE);
+		if (has_nonprintable_char(parmarea.command_line))
+			boot_warn("Kernel command line was treated as EBCDIC, but contains non-printable characters\n");
+	}
 	/* copy arch command line */
 	strscpy(early_command_line, strim(parmarea.command_line));
 
Signature · 1 line
2.55.0
#1 lore raw
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 10 lines

Users may accidentally add multi-byte UTF-8 characters to zipl.conf parmline, for example, by copying snippets containing non-breaking spaces (\xC2\xA0) from web pages.

The kernel will then interpret the entire command line as EBCDIC, making it unusable. Distinguish this situation from the legitimate EBCDIC conversion by looking for non-printable characters and issue a warning.

Sashiko has reviewed this patch and found no issues. It looks great!

Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
maintainer Reviewed-by on v2 1/1
#2 lore raw
In reply to Ilya Leoshkevich

arch/s390/boot/ipl_parm.c static inline int has_ebcdic_char(const char *str) · line 179

Quoted 4 lines · Ilya Leoshkevich
arch/s390/boot/ipl_parm.c +4 -0
+static inline bool has_nonprintable_char(const char *str)
+{
+	for (int i = 0; str[i]; i++) {
+		unsigned char c = (unsigned char)str[i];

What is the cast good for? Maybe this could be removed when applying. Anyway, thanks!