From patchwork Tue Jul 14 04:51:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 11661365 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1668B6C1 for ; Tue, 14 Jul 2020 04:52:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E138D2193E for ; Tue, 14 Jul 2020 04:52:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cn5eHwOZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E138D2193E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvCvg-0005jQ-6E for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 Jul 2020 00:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvCuh-00044V-2W; Tue, 14 Jul 2020 00:51:31 -0400 Received: from mail-qt1-x829.google.com ([2607:f8b0:4864:20::829]:35174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvCuf-0004tq-Ky; Tue, 14 Jul 2020 00:51:30 -0400 Received: by mail-qt1-x829.google.com with SMTP id b25so11917396qto.2; Mon, 13 Jul 2020 21:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PBERzEG1GysXrcTH7gh8mB6ppyy7Uo8bs5uoGDwt1Fs=; b=Cn5eHwOZrScNQnscimp5IIcuOk94pEqIzHfq6YJzxb3TXexWrSORio/EbauMdx27O8 7fJKurH2Yupq2GydQSaCI6a9zMpYq+P07h29YNy/TSYFR4XtdefjngUzmD/5Gice7EZs p6fGmq9AdI8HFeaJIAr0bzrpFfe81ofDJbtJA1COuCwMovjXxxxSlJ1Mw8Ebejwvb0+z TNZkx7D7RMNKnYh92DRAqgd4fWYRNizvdC1Mj0dLglLB4xdrjA9RElJrqjZjvX7s4QYU tWO8/oNZY+9Zvmzue3inM8n9jmUvkomp3+tcmMtipB1sBq4cSEX4iF589QTvNdEhtuY2 BWVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PBERzEG1GysXrcTH7gh8mB6ppyy7Uo8bs5uoGDwt1Fs=; b=nrr+JEX1b90gQgNLmW3ti9bAIC/rX0X158Hrk8JstYH5od7jCsH1sGw2Tnh4L+wlZI tiXaHJPEQi4R2tuLhq9u3Kuivm3jAmWMO8wmv1siSZd/wmxe8wR9uos+dIh2zoADM0Ay SCuaxYEJXC2GHmmeC3buhHQYFHCHXZ9XZ5+mYX7JFmRgBJSgYzE0Hw7AbgoucAsgIzq6 VxFJwHmru7ItXE/2smdwZce0+PD9VMD5UoLI6LFB+8G1HZS/TmBtYV/gqjXAX9VeCYmj mqKnh9wASOucwfCWHhxHa23x4sqlcgznih2cEuXfBE9ThOshpaZ9YNNgZ0wtjB2MeK/B 1V2A== X-Gm-Message-State: AOAM530P5ErWU6cFHnFAiLaPwkm8bu+Rr/92ZEpp/E3/ngE9T5HPsB9h Ga5w15ZGYvf+0qVrjtgQHAnHTu95 X-Google-Smtp-Source: ABdhPJy0Ps7369osGxGFHDrbyAKxkSKcwLMj7vIgQ1CSyuk4Z/wqZMW053tdnMwNhIUvc475m/ZQ8g== X-Received: by 2002:ac8:33f8:: with SMTP id d53mr2849248qtb.80.1594702288048; Mon, 13 Jul 2020 21:51:28 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id p3sm20518750qtl.21.2020.07.13.21.51.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Jul 2020 21:51:27 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Subject: [PULL 2/4] qga: fix assert regression on guest-shutdown Date: Mon, 13 Jul 2020 23:51:12 -0500 Message-Id: <20200714045114.29319-3-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200714045114.29319-1-mdroth@linux.vnet.ibm.com> References: <20200714045114.29319-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::829; envelope-from=flukshun@gmail.com; helo=mail-qt1-x829.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-stable@nongnu.org, =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Since commit 781f2b3d1e ("qga: process_event() simplification"), send_response() is called unconditionally, but will assert when "rsp" is NULL. This may happen with QCO_NO_SUCCESS_RESP commands, such as "guest-shutdown". Fixes: 781f2b3d1e5ef389b44016a897fd55e7a780bf35 Cc: Michael Roth Reported-by: Christian Ehrhardt Signed-off-by: Marc-André Lureau Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Christian Ehrhardt Tested-by: Christian Ehrhardt Cc: qemu-stable@nongnu.org Signed-off-by: Michael Roth --- qga/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qga/main.c b/qga/main.c index f0e454f28d..3febf3b0fd 100644 --- a/qga/main.c +++ b/qga/main.c @@ -531,7 +531,11 @@ static int send_response(GAState *s, const QDict *rsp) QString *payload_qstr, *response_qstr; GIOStatus status; - g_assert(rsp && s->channel); + g_assert(s->channel); + + if (!rsp) { + return 0; + } payload_qstr = qobject_to_json(QOBJECT(rsp)); if (!payload_qstr) {