| Message ID | 20181115143535.5885-3-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/block/onenand: fix out-of-bounds read | expand |
On 15/11/18 15:35, Peter Maydell wrote: > Update the onenand device to use qemu_log_mask() for reporting > guest errors and unimplemented features, rather than plain > fprintf() and hw_error(). > > (We leave the hw_error() in onenand_reset(), as that is > triggered by a failure to read the underlying block device > for the bootRAM, not by guest action.) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/block/onenand.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) > > diff --git a/hw/block/onenand.c b/hw/block/onenand.c > index 49ef68c9b14..2b48609776d 100644 > --- a/hw/block/onenand.c > +++ b/hw/block/onenand.c > @@ -28,6 +28,7 @@ > #include "exec/memory.h" > #include "hw/sysbus.h" > #include "qemu/error-report.h" > +#include "qemu/log.h" > > /* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */ > #define PAGE_SHIFT 11 > @@ -594,8 +595,8 @@ static void onenand_command(OneNANDState *s) > default: > s->status |= ONEN_ERR_CMD; > s->intstatus |= ONEN_INT; > - fprintf(stderr, "%s: unknown OneNAND command %x\n", > - __func__, s->command); > + qemu_log_mask(LOG_GUEST_ERROR, "unknown OneNAND command %x\n", > + s->command); > } > > onenand_intr_update(s); > @@ -657,12 +658,13 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, > case 0xff02: /* ECC Result of spare area data */ > case 0xff03: /* ECC Result of main area data */ > case 0xff04: /* ECC Result of spare area data */ > - hw_error("%s: implement ECC\n", __func__); > + qemu_log_mask(LOG_UNIMP, > + "onenand: ECC result registers unimplemented\n"); > return 0x0000; > } > > - fprintf(stderr, "%s: unknown OneNAND register %x\n", > - __func__, offset); > + qemu_log_mask(LOG_GUEST_ERROR, "read of unknown OneNAND register 0x%x\n", > + offset); > return 0; > } > > @@ -706,8 +708,9 @@ static void onenand_write(void *opaque, hwaddr addr, > break; > > default: > - fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n", > - __func__, value); > + qemu_log_mask(LOG_GUEST_ERROR, > + "unknown OneNAND boot command %" PRIx64 "\n", > + value); > } > break; > > @@ -757,8 +760,9 @@ static void onenand_write(void *opaque, hwaddr addr, > break; > > default: > - fprintf(stderr, "%s: unknown OneNAND register %x\n", > - __func__, offset); > + qemu_log_mask(LOG_GUEST_ERROR, > + "write to unknown OneNAND register 0x%x\n", > + offset); > } > } > >
On 11/15/18 3:35 PM, Peter Maydell wrote: > Update the onenand device to use qemu_log_mask() for reporting > guest errors and unimplemented features, rather than plain > fprintf() and hw_error(). > > (We leave the hw_error() in onenand_reset(), as that is > triggered by a failure to read the underlying block device > for the bootRAM, not by guest action.) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/block/onenand.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 2018-11-15 15:35, Peter Maydell wrote: > Update the onenand device to use qemu_log_mask() for reporting > guest errors and unimplemented features, rather than plain > fprintf() and hw_error(). > > (We leave the hw_error() in onenand_reset(), as that is > triggered by a failure to read the underlying block device > for the bootRAM, not by guest action.) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > hw/block/onenand.c | 22 +++++++++++++--------- > 1 file changed, 13 insertions(+), 9 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/block/onenand.c b/hw/block/onenand.c index 49ef68c9b14..2b48609776d 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -28,6 +28,7 @@ #include "exec/memory.h" #include "hw/sysbus.h" #include "qemu/error-report.h" +#include "qemu/log.h" /* 11 for 2kB-page OneNAND ("2nd generation") and 10 for 1kB-page chips */ #define PAGE_SHIFT 11 @@ -594,8 +595,8 @@ static void onenand_command(OneNANDState *s) default: s->status |= ONEN_ERR_CMD; s->intstatus |= ONEN_INT; - fprintf(stderr, "%s: unknown OneNAND command %x\n", - __func__, s->command); + qemu_log_mask(LOG_GUEST_ERROR, "unknown OneNAND command %x\n", + s->command); } onenand_intr_update(s); @@ -657,12 +658,13 @@ static uint64_t onenand_read(void *opaque, hwaddr addr, case 0xff02: /* ECC Result of spare area data */ case 0xff03: /* ECC Result of main area data */ case 0xff04: /* ECC Result of spare area data */ - hw_error("%s: implement ECC\n", __func__); + qemu_log_mask(LOG_UNIMP, + "onenand: ECC result registers unimplemented\n"); return 0x0000; } - fprintf(stderr, "%s: unknown OneNAND register %x\n", - __func__, offset); + qemu_log_mask(LOG_GUEST_ERROR, "read of unknown OneNAND register 0x%x\n", + offset); return 0; } @@ -706,8 +708,9 @@ static void onenand_write(void *opaque, hwaddr addr, break; default: - fprintf(stderr, "%s: unknown OneNAND boot command %"PRIx64"\n", - __func__, value); + qemu_log_mask(LOG_GUEST_ERROR, + "unknown OneNAND boot command %" PRIx64 "\n", + value); } break; @@ -757,8 +760,9 @@ static void onenand_write(void *opaque, hwaddr addr, break; default: - fprintf(stderr, "%s: unknown OneNAND register %x\n", - __func__, offset); + qemu_log_mask(LOG_GUEST_ERROR, + "write to unknown OneNAND register 0x%x\n", + offset); } }
Update the onenand device to use qemu_log_mask() for reporting guest errors and unimplemented features, rather than plain fprintf() and hw_error(). (We leave the hw_error() in onenand_reset(), as that is triggered by a failure to read the underlying block device for the bootRAM, not by guest action.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/block/onenand.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) -- 2.19.1