From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ8cK-00064W-AE for qemu-devel@nongnu.org; Fri, 22 Mar 2013 16:31:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ8cJ-00022E-Af for qemu-devel@nongnu.org; Fri, 22 Mar 2013 16:31:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ8cJ-00021v-3n for qemu-devel@nongnu.org; Fri, 22 Mar 2013 16:31:11 -0400 Date: Fri, 22 Mar 2013 16:31:07 -0400 From: Luiz Capitulino Message-ID: <20130322163107.489dd941@doriath> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] qemu-ga: ga_get_fd_handle(): abort if fd_counter overflows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: mdroth@linux.vnet.ibm.com 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 --- 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 + * would have to be issued 2^63 times */ + if (s->pstate.fd_counter == INT64_MAX) { + abort(); } + if (!write_persistent_state(&s->pstate, s->pstate_filepath)) { error_setg(errp, "failed to commit persistent state to disk"); } -- 1.8.1.4