From: Gabriel L. Somlo <somlo@cmu.edu>
Date: Wed, 29 Apr 2015 15:21:51 +0000 (-0400)
Subject: fw_cfg: prevent selector key conflict
X-Git-Tag: qemu-xen-4.7.0-rc1~262^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0f9b214139d11ef058fa0f1c11c89e94fa6ef95d;p=qemu-xen.git

fw_cfg: prevent selector key conflict

Enforce a single assignment of data for each distinct selector key.

Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index d2a43470e0..0c0e15ecf5 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -423,6 +423,7 @@ static void fw_cfg_add_bytes_read_callback(FWCfgState *s, uint16_t key,
     key &= FW_CFG_ENTRY_MASK;
 
     assert(key < FW_CFG_MAX_ENTRY && len < UINT32_MAX);
+    assert(s->entries[arch][key].data == NULL); /* avoid key conflict */
 
     s->entries[arch][key].data = data;
     s->entries[arch][key].len = (uint32_t)len;