From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:53897)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1UJ8rn-0004vj-0d
	for qemu-devel@nongnu.org; Fri, 22 Mar 2013 16:47:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1UJ8rm-0007Vn-1C
	for qemu-devel@nongnu.org; Fri, 22 Mar 2013 16:47:10 -0400
Received: from mx1.redhat.com ([209.132.183.28]:30073)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1UJ8rl-0007Vg-Pg
	for qemu-devel@nongnu.org; Fri, 22 Mar 2013 16:47:09 -0400
Date: Fri, 22 Mar 2013 16:47:05 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20130322164705.314db6c2@doriath>
In-Reply-To: <514CC295.702@redhat.com>
References: <20130322163107.489dd941@doriath>
	<514CC295.702@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] qemu-ga: ga_get_fd_handle(): abort if
 fd_counter overflows
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: Eric Blake <eblake@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>, mdroth@linux.vnet.ibm.com

On Fri, 22 Mar 2013 14:44:05 -0600
Eric Blake <eblake@redhat.com> wrote:

> On 03/22/2013 02:31 PM, Luiz Capitulino wrote:
> > Today we reset fd_counter if it wraps, but it's better to abort()
> > instead, as fd_counter should never reach INT64_MAX.
> > 
> > Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
> > ---
> >  qga/main.c | 8 ++++++--
> >  1 file changed, 6 insertions(+), 2 deletions(-)
> > 
> 
> 
> > diff --git a/qga/main.c b/qga/main.c
> > index 74ef788..5f505a2 100644
> > --- a/qga/main.c
> > +++ b/qga/main.c
> > @@ -889,9 +889,13 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp)
> >      g_assert(!ga_is_frozen(s));
> >  
> >      handle = s->pstate.fd_counter++;
> > -    if (s->pstate.fd_counter < 0) {
> > -        s->pstate.fd_counter = 0;
> > +
> > +    /* This should never happen on a resonable timeframe, as guest-file-open
> 
> s/resonable/reasonable/

Michael, can you fix it for me?

> 
> > +     * would have to be issued 2^63 times */
> > +    if (s->pstate.fd_counter == INT64_MAX) {
> > +        abort();
> 
> Fix the typo, and you can add:
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks!