From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2Zbx-0004vU-Ag for qemu-devel@nongnu.org; Wed, 10 Jun 2015 02:35:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2Zbt-000547-G5 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 02:35:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2Zbt-00053b-Ah for qemu-devel@nongnu.org; Wed, 10 Jun 2015 02:35:37 -0400 From: Gerd Hoffmann Date: Wed, 10 Jun 2015 08:35:28 +0200 Message-Id: <1433918131-6850-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1433918131-6850-1-git-send-email-kraxel@redhat.com> References: <1433918131-6850-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL v3 5/8] fw_cfg: prevent selector key conflict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Gabriel L. Somlo" , Gerd Hoffmann From: "Gabriel L. Somlo" Enforce a single assignment of data for each distinct selector key. Signed-off-by: Gabriel Somlo Reviewed-by: Laszlo Ersek Signed-off-by: Gerd Hoffmann --- 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 d2a4347..0c0e15e 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; -- 1.8.3.1