[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/5] fw_cfg: prevent selector key conflict
From: |
Gabriel L. Somlo |
Subject: |
[Qemu-devel] [PATCH v2 3/5] fw_cfg: prevent selector key conflict |
Date: |
Wed, 18 Mar 2015 20:18:29 -0400 |
Enforce a single assignment of data for each distinct selector key.
Signed-off-by: Gabriel Somlo <address@hidden>
---
hw/nvram/fw_cfg.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 2f609b4..659de4c 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;
--
2.1.0