39134eb9d2
on invalid state load CVE-2013-4539-qemut-tsc210x-fix-buffer-overrun-on-invalid-state-load.patch - bsc#962632 - VUL-0: CVE-2015-1779: xen: vnc: insufficient resource limiting in VNC websockets decoder CVE-2015-1779-qemuu-limit-size-of-HTTP-headers-from-websockets-clients.patch CVE-2015-1779-qemuu-incrementally-decode-websocket-frames.patch - bsc#962642 - VUL-0: CVE-2013-4537: xen: ssi-sd: buffer overrun on invalid state load CVE-2013-4537-qemut-ssi-sd-fix-buffer-overrun-on-invalid-state-load.patch - bsc#962627 - VUL-0: CVE-2014-7815: xen: vnc: insufficient bits_per_pixel from the client sanitization CVE-2014-7815-qemut-vnc-sanitize-bits_per_pixel-from-the-client.patch - bsc#962335 - VUL-0: CVE-2013-4538: xen: ssd0323: fix buffer overun on invalid state CVE-2013-4538-qemut-ssd0323-fix-buffer-overun-on-invalid-state.patch - bsc#962360 - VUL-0: CVE-2015-7512: xen: net: pcnet: buffer overflow in non-loopback mode CVE-2015-7512-qemuu-net-pcnet-buffer-overflow-in-non-loopback-mode.patch CVE-2015-7512-qemut-net-pcnet-buffer-overflow-in-non-loopback-mode.patch - bsc#961692 - VUL-0: CVE-2016-1714: xen: nvram: OOB r/w access in processing firmware configurations CVE-2016-1714-qemuu-fw_cfg-add-check-to-validate-current-entry-value.patch CVE-2016-1714-qemut-fw_cfg-add-check-to-validate-current-entry-value.patch - bsc#961358 - VUL-0: CVE-2015-8613: xen: qemu: scsi: stack based buffer overflow in megasas_ctrl_get_info OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=395
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
Reference: bsc#961692 CVE-2016-1714
|
|
|
|
When processing firmware configurations, an OOB r/w access occurs
|
|
if 's->cur_entry' is set to be invalid(FW_CFG_INVALID=0xffff).
|
|
Add a check to validate 's->cur_entry' to avoid such access.
|
|
|
|
Reported-by: Donghai Zdh <address@hidden>
|
|
Signed-off-by: Prasad J Pandit <address@hidden>
|
|
---
|
|
hw/nvram/fw_cfg.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
Updated as per review in
|
|
-> https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg00398.html
|
|
|
|
Index: xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/hw/fw_cfg.c
|
|
===================================================================
|
|
--- xen-4.6.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/fw_cfg.c
|
|
+++ xen-4.6.0-testing/tools/qemu-xen-traditional-dir-remote/hw/fw_cfg.c
|
|
@@ -54,11 +54,15 @@ typedef struct _FWCfgState {
|
|
static void fw_cfg_write(FWCfgState *s, uint8_t value)
|
|
{
|
|
int arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL);
|
|
- FWCfgEntry *e = &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];
|
|
+ FWCfgEntry *e = (s->cur_entry == FW_CFG_INVALID) ? NULL :
|
|
+ &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];
|
|
|
|
FW_CFG_DPRINTF("write %d\n", value);
|
|
|
|
- if (s->cur_entry & FW_CFG_WRITE_CHANNEL && s->cur_offset < e->len) {
|
|
+ if (s->cur_entry & FW_CFG_WRITE_CHANNEL
|
|
+ && e != NULL
|
|
+ && e->callback
|
|
+ && s->cur_offset < e->len) {
|
|
e->data[s->cur_offset++] = value;
|
|
if (s->cur_offset == e->len) {
|
|
e->callback(e->callback_opaque, e->data);
|
|
@@ -88,7 +92,8 @@ static int fw_cfg_select(FWCfgState *s,
|
|
static uint8_t fw_cfg_read(FWCfgState *s)
|
|
{
|
|
int arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL);
|
|
- FWCfgEntry *e = &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];
|
|
+ FWCfgEntry *e = (s->cur_entry == FW_CFG_INVALID) ? NULL :
|
|
+ &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];
|
|
uint8_t ret;
|
|
|
|
if (s->cur_entry == FW_CFG_INVALID || !e->data || s->cur_offset >= e->len)
|