Currently s390 supports a fixed maximum command line length of 896 bytes. This isn't enough as some installers are trying to pass all configuration data via kernel command line, and even with zfcp alone it is easy to generate really long command lines. Therefore extend the command line to 4 kbytes. In the parm area where the command line is stored there is no indication of the maximum allowed length, so a new field which contains the maximum length is added. The parm area has always been initialized to zero, so with old kernels this field would read zero. This is important because tools like zipl could read this field. If it contains a number larger than zero zipl knows the maximum length that can be stored in the parm area, otherwise it must assume that it is booting a legacy kernel and only 896 bytes are available. The removing of trailing whitespace in head.S is also removed because code to do this is already present in setup_boot_command_line().
Unified · Split
| @@ -184,35 +184,23 @@ iplstart: · 183 unmodified lines | |||
| 184 | bas %r14,.Lloader # load parameter file | 184 | bas %r14,.Lloader # load parameter file |
| 185 | ltr %r2,%r2 # got anything ? | 185 | ltr %r2,%r2 # got anything ? |
| 186 | bz .Lnopf | 186 | bz .Lnopf |
| 187 | chi %r2,895 | 187 | l %r3,MAX_COMMAND_LINE_SIZE+ARCH_OFFSET-PARMAREA(%r12) |
| 188 | bnh .Lnotrunc | 188 | ahi %r3,-1 |
| 189 | la %r2,895 | 189 | clr %r2,%r3 |
| 190 | bl .Lnotrunc | ||
| 191 | lr %r2,%r3 | ||
| 190 | .Lnotrunc: | 192 | .Lnotrunc: |
| 191 | l %r4,.Linitrd | 193 | l %r4,.Linitrd |
| 192 | clc 0(3,%r4),.L_hdr # if it is HDRx | 194 | clc 0(3,%r4),.L_hdr # if it is HDRx |
| 193 | bz .Lagain1 # skip dataset header | 195 | bz .Lagain1 # skip dataset header |
| 194 | clc 0(3,%r4),.L_eof # if it is EOFx | 196 | clc 0(3,%r4),.L_eof # if it is EOFx |
| 195 | bz .Lagain1 # skip dateset trailer | 197 | bz .Lagain1 # skip dateset trailer |
| 196 | la %r5,0(%r4,%r2) | 198 | |
| 197 | lr %r3,%r2 | 199 | lr %r5,%r2 |
| 198 | la %r3,COMMAND_LINE-PARMAREA(%r12) # load adr. of command line | 200 | la %r6,COMMAND_LINE-PARMAREA(%r12) |
| 199 | mvc 0(256,%r3),0(%r4) | 201 | lr %r7,%r2 |
| 200 | mvc 256(256,%r3),256(%r4) | 202 | ahi %r7,1 |
| 201 | mvc 512(256,%r3),512(%r4) | 203 | mvcl %r6,%r4 |
| 202 | mvc 768(122,%r3),768(%r4) | ||
| 203 | slr %r0,%r0 | ||
| 204 | b .Lcntlp | ||
| 205 | .Ldelspc: | ||
| 206 | ic %r0,0(%r2,%r3) | ||
| 207 | chi %r0,0x20 # is it a space ? | ||
| 208 | be .Lcntlp | ||
| 209 | ahi %r2,1 | ||
| 210 | b .Leolp | ||
| 211 | .Lcntlp: | ||
| 212 | brct %r2,.Ldelspc | ||
| 213 | .Leolp: | ||
| 214 | slr %r0,%r0 | ||
| 215 | stc %r0,0(%r2,%r3) # terminate buffer | ||
| 216 | .Lnopf: | 204 | .Lnopf: |
| 217 | 205 | ||
| 218 | # | 206 | # |
| @@ -394,6 +382,7 @@ SYM_DATA_START(parmarea) · 175 unmodified lines | |||
| 394 | .quad 0 # OLDMEM_BASE | 382 | .quad 0 # OLDMEM_BASE |
| 395 | .quad 0 # OLDMEM_SIZE | 383 | .quad 0 # OLDMEM_SIZE |
| 396 | .quad kernel_version # points to kernel version string | 384 | .quad kernel_version # points to kernel version string |
| 385 | .quad COMMAND_LINE_SIZE | ||
| 397 | 386 | ||
| 398 | .org COMMAND_LINE | 387 | .org COMMAND_LINE |
| 399 | .byte "root=/dev/ram0 ro" | 388 | .byte "root=/dev/ram0 ro" |
| @@ -170,10 +170,10 @@ static inline int has_ebcdic_char(const char *str) · 169 unmodified lines | |||
| 170 | 170 | ||
| 171 | void setup_boot_command_line(void) | 171 | void setup_boot_command_line(void) |
| 172 | { | 172 | { |
| 173 | parmarea.command_line[ARCH_COMMAND_LINE_SIZE - 1] = 0; | 173 | parmarea.command_line[COMMAND_LINE_SIZE - 1] = 0; |
| 174 | /* convert arch command line to ascii if necessary */ | 174 | /* convert arch command line to ascii if necessary */ |
| 175 | if (has_ebcdic_char(parmarea.command_line)) | 175 | if (has_ebcdic_char(parmarea.command_line)) |
| 176 | EBCASC(parmarea.command_line, ARCH_COMMAND_LINE_SIZE); | 176 | EBCASC(parmarea.command_line, COMMAND_LINE_SIZE); |
| 177 | /* copy arch command line */ | 177 | /* copy arch command line */ |
| 178 | strcpy(early_command_line, strim(parmarea.command_line)); | 178 | strcpy(early_command_line, strim(parmarea.command_line)); |
| 179 | 179 | ||
| @@ -42,6 +42,8 @@ · 41 unmodified lines | |||
| 42 | #define STARTUP_NORMAL_OFFSET 0x10000 | 42 | #define STARTUP_NORMAL_OFFSET 0x10000 |
| 43 | #define STARTUP_KDUMP_OFFSET 0x10010 | 43 | #define STARTUP_KDUMP_OFFSET 0x10010 |
| 44 | 44 | ||
| 45 | #define LEGACY_COMMAND_LINE_SIZE 896 | ||
| 46 | |||
| 45 | #ifndef __ASSEMBLY__ | 47 | #ifndef __ASSEMBLY__ |
| 46 | 48 | ||
| 47 | #include <asm/lowcore.h> | 49 | #include <asm/lowcore.h> |
| @@ -54,8 +56,9 @@ struct parmarea { · 6 unmodified lines | |||
| 54 | unsigned long oldmem_base; /* 0x10418 */ | 56 | unsigned long oldmem_base; /* 0x10418 */ |
| 55 | unsigned long oldmem_size; /* 0x10420 */ | 57 | unsigned long oldmem_size; /* 0x10420 */ |
| 56 | unsigned long kernel_version; /* 0x10428 */ | 58 | unsigned long kernel_version; /* 0x10428 */ |
| 57 | char pad1[0x10480 - 0x10430]; /* 0x10430 - 0x10480 */ | 59 | unsigned long max_command_line_size; /* 0x10430 */ |
| 58 | char command_line[ARCH_COMMAND_LINE_SIZE]; /* 0x10480 */ | 60 | char pad1[0x10480-0x10438]; /* 0x10438 - 0x10480 */ |
| 61 | char command_line[COMMAND_LINE_SIZE]; /* 0x10480 */ | ||
| 59 | }; | 62 | }; |
| 60 | 63 | ||
| 61 | extern struct parmarea parmarea; | 64 | extern struct parmarea parmarea; |
| @@ -9,6 +9,4 @@ · 8 unmodified lines | |||
| 9 | 9 | ||
| 10 | #define COMMAND_LINE_SIZE 4096 | 10 | #define COMMAND_LINE_SIZE 4096 |
| 11 | 11 | ||
| 12 | #define ARCH_COMMAND_LINE_SIZE 896 | ||
| 13 | |||
| 14 | #endif /* _UAPI_ASM_S390_SETUP_H */ | 12 | #endif /* _UAPI_ASM_S390_SETUP_H */ |
| @@ -164,5 +164,6 @@ int main(void) · 163 unmodified lines | |||
| 164 | DEFINE(OLDMEM_BASE, PARMAREA + offsetof(struct parmarea, oldmem_base)); | 164 | DEFINE(OLDMEM_BASE, PARMAREA + offsetof(struct parmarea, oldmem_base)); |
| 165 | DEFINE(OLDMEM_SIZE, PARMAREA + offsetof(struct parmarea, oldmem_size)); | 165 | DEFINE(OLDMEM_SIZE, PARMAREA + offsetof(struct parmarea, oldmem_size)); |
| 166 | DEFINE(COMMAND_LINE, PARMAREA + offsetof(struct parmarea, command_line)); | 166 | DEFINE(COMMAND_LINE, PARMAREA + offsetof(struct parmarea, command_line)); |
| 167 | DEFINE(MAX_COMMAND_LINE_SIZE, PARMAREA + offsetof(struct parmarea, max_command_line_size)); | ||
| 167 | return 0; | 168 | return 0; |
| 168 | } | 169 | } |
| @@ -280,7 +280,7 @@ char __bootdata(early_command_line)[COMMAND_LINE_SIZE]; · 279 unmodified lines | |||
| 280 | static void __init setup_boot_command_line(void) | 280 | static void __init setup_boot_command_line(void) |
| 281 | { | 281 | { |
| 282 | /* copy arch command line */ | 282 | /* copy arch command line */ |
| 283 | strlcpy(boot_command_line, early_command_line, ARCH_COMMAND_LINE_SIZE); | 283 | strlcpy(boot_command_line, early_command_line, COMMAND_LINE_SIZE); |
| 284 | } | 284 | } |
| 285 | 285 | ||
| 286 | static void __init check_image_bootable(void) | 286 | static void __init check_image_bootable(void) |
| @@ -216,7 +216,9 @@ void *kexec_file_add_components(struct kimage *image, · 215 unmodified lines | |||
| 216 | int (*add_kernel)(struct kimage *image, | 216 | int (*add_kernel)(struct kimage *image, |
| 217 | struct s390_load_data *data)) | 217 | struct s390_load_data *data)) |
| 218 | { | 218 | { |
| 219 | unsigned long max_command_line_size = LEGACY_COMMAND_LINE_SIZE; | ||
| 219 | struct s390_load_data data = {0}; | 220 | struct s390_load_data data = {0}; |
| 221 | unsigned long minsize; | ||
| 220 | int ret; | 222 | int ret; |
| 221 | 223 | ||
| 222 | data.report = ipl_report_init(&ipl_block); | 224 | data.report = ipl_report_init(&ipl_block); |
| @@ -227,11 +229,23 @@ void *kexec_file_add_components(struct kimage *image, · 4 unmodified lines | |||
| 227 | if (ret) | 229 | if (ret) |
| 228 | goto out; | 230 | goto out; |
| 229 | 231 | ||
| 230 | if (image->kernel_buf_len < PARMAREA + sizeof(struct parmarea) || | 232 | ret = -EINVAL; |
| 231 | image->cmdline_buf_len >= ARCH_COMMAND_LINE_SIZE) { | 233 | minsize = PARMAREA + offsetof(struct parmarea, command_line); |
| 232 | ret = -EINVAL; | 234 | if (image->kernel_buf_len < minsize) |
| 233 | goto out; | 235 | goto out; |
| 234 | } | 236 | |
| 237 | if (data.parm->max_command_line_size) | ||
| 238 | max_command_line_size = data.parm->max_command_line_size; | ||
| 239 | |||
| 240 | if (minsize + max_command_line_size < minsize) | ||
| 241 | goto out; | ||
| 242 | |||
| 243 | if (image->kernel_buf_len < minsize + max_command_line_size) | ||
| 244 | goto out; | ||
| 245 | |||
| 246 | if (image->cmdline_buf_len >= max_command_line_size) | ||
| 247 | goto out; | ||
| 248 | |||
| 235 | memcpy(data.parm->command_line, image->cmdline_buf, | 249 | memcpy(data.parm->command_line, image->cmdline_buf, |
| 236 | image->cmdline_buf_len); | 250 | image->cmdline_buf_len); |
| 237 | 251 | ||