From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53781)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1a1iE1-0005UI-FB
	for qemu-devel@nongnu.org; Wed, 25 Nov 2015 17:07:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jcody@redhat.com>) id 1a1iDy-0004aB-A0
	for qemu-devel@nongnu.org; Wed, 25 Nov 2015 17:07:41 -0500
Date: Wed, 25 Nov 2015 17:07:35 -0500
From: Jeff Cody <jcody@redhat.com>
Message-ID: <20151125220735.GC2645@localhost.localdomain>
References: <1448485417-8196-1-git-send-email-jsnow@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1448485417-8196-1-git-send-email-jsnow@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v2] util/id: fully allocate names table
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: John Snow <jsnow@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org

On Wed, Nov 25, 2015 at 04:03:37PM -0500, John Snow wrote:
> Trivial: this array should be allocated to have ID_MAX entries always.
> Otherwise if someone were to forget to expand this table, the assertion
> in the id generator won't actually trigger; it will read junk data.
> 
> v2: Fix the range assertion, too. Compare against the known actual size
>     of the table instead of what it "should" be.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  util/id.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/util/id.c b/util/id.c
> index bcc64d8..7883fbe 100644
> --- a/util/id.c
> +++ b/util/id.c
> @@ -29,7 +29,7 @@ bool id_wellformed(const char *id)
>  
>  #define ID_SPECIAL_CHAR '#'
>  
> -static const char *const id_subsys_str[] = {
> +static const char *const id_subsys_str[ID_MAX] = {
>      [ID_QDEV]  = "qdev",
>      [ID_BLOCK] = "block",
>  };
> @@ -53,7 +53,7 @@ char *id_generate(IdSubSystems id)
>      static uint64_t id_counters[ID_MAX];
>      uint32_t rnd;
>  
> -    assert(id < ID_MAX);
> +    assert(id < ARRAY_SIZE(id_subsys_str));
>      assert(id_subsys_str[id]);
>  
>      rnd = g_random_int_range(0, 100);
> -- 
> 2.4.3
> 

Reviewed-by: Jeff Cody <jcody@redhat.com>