From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnToG-0008F4-RW for qemu-devel@nongnu.org; Wed, 29 Apr 2015 11:22:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnToC-0002yr-9z for qemu-devel@nongnu.org; Wed, 29 Apr 2015 11:22:00 -0400 Received: from relay-06.andrew.cmu.edu ([128.2.157.21]:36064 helo=relay.andrew.cmu.edu) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnToC-0002yh-59 for qemu-devel@nongnu.org; Wed, 29 Apr 2015 11:21:56 -0400 From: "Gabriel L. Somlo" Date: Wed, 29 Apr 2015 11:21:51 -0400 Message-Id: <1430320913-20737-3-git-send-email-somlo@cmu.edu> In-Reply-To: <1430320913-20737-1-git-send-email-somlo@cmu.edu> References: <1430320913-20737-1-git-send-email-somlo@cmu.edu> Subject: [Qemu-devel] [PATCH V4 2/4] fw_cfg: prevent selector key conflict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: gsomlo@gmail.com, matt.fleming@intel.com, lersek@redhat.com, kraxel@redhat.com, mst@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