|
 |
f0208c |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
f0208c |
Date: Thu, 19 May 2016 16:09:30 +0530
|
|
|
f0208c |
Subject: [PATCH] esp: check command buffer length before write(CVE-2016-4439)
|
|
|
f0208c |
|
|
|
f0208c |
The 53C9X Fast SCSI Controller(FSC) comes with an internal 16-byte
|
|
|
f0208c |
FIFO buffer. It is used to handle command and data transfer. While
|
|
|
f0208c |
writing to this command buffer 's->cmdbuf[TI_BUFSZ=16]', a check
|
|
|
f0208c |
was missing to validate input length. Add check to avoid OOB write
|
|
|
f0208c |
access.
|
|
|
f0208c |
|
|
|
f0208c |
Fixes CVE-2016-4439.
|
|
|
f0208c |
|
|
|
f0208c |
Reported-by: Li Qiang <liqiang6-s@360.cn>
|
|
|
f0208c |
Cc: qemu-stable@nongnu.org
|
|
|
f0208c |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
f0208c |
Message-Id: <1463654371-11169-2-git-send-email-ppandit@redhat.com>
|
|
|
f0208c |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
f0208c |
(cherry picked from commit c98c6c105f66f05aa0b7c1d2a4a3f716450907ef)
|
|
|
f0208c |
---
|
|
|
f0208c |
hw/scsi/esp.c | 6 +++++-
|
|
|
f0208c |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
f0208c |
|
|
|
f0208c |
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
|
|
|
f0208c |
index 8961be2..01497e6 100644
|
|
|
f0208c |
--- a/hw/scsi/esp.c
|
|
|
f0208c |
+++ b/hw/scsi/esp.c
|
|
|
f0208c |
@@ -448,7 +448,11 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint64_t val)
|
|
|
f0208c |
break;
|
|
|
f0208c |
case ESP_FIFO:
|
|
|
f0208c |
if (s->do_cmd) {
|
|
|
f0208c |
- s->cmdbuf[s->cmdlen++] = val & 0xff;
|
|
|
f0208c |
+ if (s->cmdlen < TI_BUFSZ) {
|
|
|
f0208c |
+ s->cmdbuf[s->cmdlen++] = val & 0xff;
|
|
|
f0208c |
+ } else {
|
|
|
f0208c |
+ trace_esp_error_fifo_overrun();
|
|
|
f0208c |
+ }
|
|
|
f0208c |
} else if (s->ti_size == TI_BUFSZ - 1) {
|
|
|
f0208c |
trace_esp_error_fifo_overrun();
|
|
|
f0208c |
} else {
|