From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avfQz-000759-Rk for qemu-devel@nongnu.org; Thu, 28 Apr 2016 02:28:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avfQu-0007CS-SQ for qemu-devel@nongnu.org; Thu, 28 Apr 2016 02:28:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avfQu-0007CG-Mh for qemu-devel@nongnu.org; Thu, 28 Apr 2016 02:28:16 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 500437F08F for ; Thu, 28 Apr 2016 06:28:16 +0000 (UTC) From: Markus Armbruster Date: Thu, 28 Apr 2016 08:28:12 +0200 Message-Id: <1461824893-21125-3-git-send-email-armbru@redhat.com> In-Reply-To: <1461824893-21125-1-git-send-email-armbru@redhat.com> References: <1461824893-21125-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL for-2.6 2/3] replay: Fix dangling location bug in replay_configure() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost replay_configure() pushes and pops a Location with automatic storage duration. Except it fails to pop when -icount parameter "rr" isn't given. cur_loc then points to unused stack space, and will most likely get clobbered in short order. Clobbered cur_loc can make loc_pop() and error_print_loc() crash or report bogus locations. Broken in commit 890ad55. I didn't take the time to find a reproducer. Cc: Eduardo Habkost Signed-off-by: Markus Armbruster Message-Id: <1461767349-15329-3-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Eduardo Habkost --- replay/replay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/replay/replay.c b/replay/replay.c index 7c2573a..167fd29 100644 --- a/replay/replay.c +++ b/replay/replay.c @@ -275,7 +275,7 @@ void replay_configure(QemuOpts *opts) rr = qemu_opt_get(opts, "rr"); if (!rr) { /* Just enabling icount */ - return; + goto out; } else if (!strcmp(rr, "record")) { mode = REPLAY_MODE_RECORD; } else if (!strcmp(rr, "replay")) { @@ -293,6 +293,7 @@ void replay_configure(QemuOpts *opts) replay_enable(fname, mode); +out: loc_pop(&loc); } -- 2.5.5