[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] s390x/ipl: check kernel command line size
From: |
Thomas Huth |
Subject: |
[PULL 1/6] s390x/ipl: check kernel command line size |
Date: |
Fri, 15 Oct 2021 11:16:17 +0200 |
From: Marc Hartmayer <mhartmay@linux.ibm.com>
Check if the provided kernel command line exceeds the maximum size of the s390x
Linux kernel command line size, which is 896 bytes.
Reported-by: Sven Schnelle <svens@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Message-Id: <20211006092631.20732-1-mhartmay@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[thuth: Adjusted format specifier for size_t]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/ipl.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 1821c6faee..7ddca0127f 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -38,6 +38,7 @@
#define KERN_IMAGE_START 0x010000UL
#define LINUX_MAGIC_ADDR 0x010008UL
#define KERN_PARM_AREA 0x010480UL
+#define KERN_PARM_AREA_SIZE 0x000380UL
#define INITRD_START 0x800000UL
#define INITRD_PARM_START 0x010408UL
#define PARMFILE_START 0x001000UL
@@ -190,10 +191,19 @@ static void s390_ipl_realize(DeviceState *dev, Error
**errp)
* loader) and it won't work. For this case we force it to 0x10000,
too.
*/
if (pentry == KERN_IMAGE_START || pentry == 0x800) {
- char *parm_area = rom_ptr(KERN_PARM_AREA, strlen(ipl->cmdline) +
1);
+ size_t cmdline_size = strlen(ipl->cmdline) + 1;
+ char *parm_area = rom_ptr(KERN_PARM_AREA, cmdline_size);
+
ipl->start_addr = KERN_IMAGE_START;
/* Overwrite parameters in the kernel image, which are "rom" */
if (parm_area) {
+ if (cmdline_size > KERN_PARM_AREA_SIZE) {
+ error_setg(errp,
+ "kernel command line exceeds maximum size: %zu
> %lu",
+ cmdline_size, KERN_PARM_AREA_SIZE);
+ return;
+ }
+
strcpy(parm_area, ipl->cmdline);
}
} else {
--
2.27.0
- [PULL 0/6] s390x patches and dtc update, Thomas Huth, 2021/10/15
- [PULL 2/6] s390x: sigp: Force Set Architecture to return Invalid Parameter, Thomas Huth, 2021/10/15
- [PULL 1/6] s390x/ipl: check kernel command line size,
Thomas Huth <=
- [PULL 3/6] vfio-ccw: step down as maintainer, Thomas Huth, 2021/10/15
- [PULL 4/6] s390x/kvm: step down as maintainer, Thomas Huth, 2021/10/15
- [PULL 6/6] dtc: Update to version 1.6.1, Thomas Huth, 2021/10/15
- [PULL 5/6] s390x virtio-ccw machine: step down as maintainer, Thomas Huth, 2021/10/15
- Re: [PULL 0/6] s390x patches and dtc update, Richard Henderson, 2021/10/15