From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZPwD-0006wG-HH for qemu-devel@nongnu.org; Sat, 21 Mar 2015 16:24:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZPw4-000098-AB for qemu-devel@nongnu.org; Sat, 21 Mar 2015 16:24:05 -0400 Received: from relay-04.andrew.cmu.edu ([128.2.105.169]:38339 helo=relay.andrew.cmu.edu) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZPw4-00008f-5F for qemu-devel@nongnu.org; Sat, 21 Mar 2015 16:23:56 -0400 From: "Gabriel L. Somlo" Date: Sat, 21 Mar 2015 16:23:48 -0400 Message-Id: <1426969430-14941-4-git-send-email-somlo@cmu.edu> In-Reply-To: <1426969430-14941-1-git-send-email-somlo@cmu.edu> References: <1426969430-14941-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [PATCH v3 3/5] fw_cfg: prevent selector key conflict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: matt.fleming@intel.com, rjones@redhat.com, jordan.l.justen@intel.com, gleb@cloudius-systems.com, mdroth@linux.vnet.ibm.com, gsomlo@gmail.com, kraxel@redhat.com, pbonzini@redhat.com, lersek@redhat.com, armbru@redhat.com Enforce a single assignment of data for each distinct selector key. Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek --- 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 ed70798..227beaf 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