From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYd9w-0003o5-QB for qemu-devel@nongnu.org; Thu, 19 Mar 2015 12:19:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYd9s-0003fT-9j for qemu-devel@nongnu.org; Thu, 19 Mar 2015 12:19:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38271) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYd9s-0003fM-4b for qemu-devel@nongnu.org; Thu, 19 Mar 2015 12:18:56 -0400 Message-ID: <550AF6E8.30806@redhat.com> Date: Thu, 19 Mar 2015 17:18:48 +0100 From: Laszlo Ersek MIME-Version: 1.0 References: <1426724311-9343-1-git-send-email-somlo@cmu.edu> <1426724311-9343-4-git-send-email-somlo@cmu.edu> In-Reply-To: <1426724311-9343-4-git-send-email-somlo@cmu.edu> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 3/5] fw_cfg: prevent selector key conflict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Gabriel L. Somlo" Cc: matt.fleming@intel.com, mdroth@linux.vnet.ibm.com, rjones@redhat.com, jordan.l.justen@intel.com, qemu-devel@nongnu.org, gleb@cloudius-systems.com, gsomlo@gmail.com, kraxel@redhat.com, pbonzini@redhat.com, armbru@redhat.com On 03/19/15 01:18, Gabriel L. Somlo wrote: > Enforce a single assignment of data for each distinct selector key. > > Signed-off-by: Gabriel Somlo > --- > 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; > Reviewed-by: Laszlo Ersek