From patchwork Thu Aug 24 09:28:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 716533 Delivered-To: patch@linaro.org Received: by 2002:adf:f747:0:b0:317:ecd7:513f with SMTP id z7csp1237434wrp; Thu, 24 Aug 2023 02:33:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYQFIuMBbFHvb4f/7Sy70F9kkOQQ9OZdd3IM2PQZjINOPqeuDfSkner7znRNXmmrAi+x/n X-Received: by 2002:a05:622a:1c5:b0:403:b088:5d3 with SMTP id t5-20020a05622a01c500b00403b08805d3mr19680896qtw.17.1692869634788; Thu, 24 Aug 2023 02:33:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692869634; cv=none; d=google.com; s=arc-20160816; b=eUSBcMBurS8TlSC6bONL43L2Jdm92CZqOmns6+8KVUaog+vMY7f2ZwMhVS1tXlZgCL +8D9CU6d2dvOhKM4gOgjzDGdONHPGvSPj6Rm6H/U0il+cHeaFAB3MGm3pdYlgE1f2hb9 lSR0LsXse5j8cXgyQOtOQl/Xq1RNaTdegDw/cd8aopPz4lTDEFEttfSxzG9i5AfnbEHY DsHX/AE0FdRzsqTW6iuI0vSaUJ3y14TfyMcn/GAA56VUL7iQ+VClNveanEwrLO9zK3m6 nXnIlfwYoT3Yg/dt/Lkm9fb4JdIPOekKskTRjK7czgGDEG3r8DHzx76FGsKIKuCZN1XF lPTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=rDBvn+8aP4FuM7R/tw2wMoRa69yeF0kW2DF1HQRjT0U=; fh=bFDrUYhlTVi/QyetgXx/byg2+yO/22Hp9SjwoefyKLk=; b=RtcSCwkNHoMyeK2vLFXMakIk1o1yrc/qGmmvOuGd5QvlegpFF5XezM7vnmGuIIhx1h JConPJ4mk8gxaJQSuTOlExZmcKCP8U7dG9hVDKYzo1QyX06EBsqSCqPZW1ClY9iRGKHE iSKw5dFkbaJ0ETHFF8bKhFrkNTgCZwF4gTK3TukXQH8F95SE3QAP64whwQUIq6dfs67m An5o8Nb4YsyObXw3dnf9Y7cVbVudu/Gz+/4OLK8wKIWhZ3H8ozXo2XyoTp7pgs+d4X/7 PRw8Ps8fDoD4Qqflxc1b7HBqHQxp8B2b3Cod4J++m3+Yxuq/z7k3fofHeQ9AbC5BOmvD wlzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uk3yZPrn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t4-20020a05622a01c400b004035b30ed1bsi3276424qtw.589.2023.08.24.02.33.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Aug 2023 02:33:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Uk3yZPrn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ6eq-00083a-92; Thu, 24 Aug 2023 05:29:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZ6e9-00047R-4F for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:59 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qZ6e1-0004yW-Ne for qemu-devel@nongnu.org; Thu, 24 Aug 2023 05:28:53 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4ff8f2630e3so10386526e87.1 for ; Thu, 24 Aug 2023 02:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692869323; x=1693474123; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=rDBvn+8aP4FuM7R/tw2wMoRa69yeF0kW2DF1HQRjT0U=; b=Uk3yZPrneVeCZefuFulG6pI7sV78J9QS6OYQ59as/SIS4zvALIJwW7TCwx6VgZmzfW TaRQsOBeUOwvDanRQQFo6Hcn0rIxQadsqpRdOtrkPWYYwh3GrjtTdKgkUaHRE7KH3/UT lZdqka5jqUrGVo2ZOK2uSTTGT+WfmgZxHulLIR8SqF9zDd2QEBrmSWvbNaKyTsSlkzY6 Zh+br9qpnAJae57Vtp6C2e4BTPjJdueGdMjXfkT0lfUkACkqN6IZdb/WR72r5tApgfWU 2bihS0Wg/ontiAayNDxBrhQ9BI9KGzTM9laCzRYBKoovonlIo9bRtdB/2I6MAKFZ3QKg TS4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692869323; x=1693474123; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rDBvn+8aP4FuM7R/tw2wMoRa69yeF0kW2DF1HQRjT0U=; b=aat0P1TA2kRfmb93pcHmkw/fLfZChSoTr22lY4zSbQ+rY/VEPkoXax0wTr7CiQfNJ3 XCDv125skv+Zmsb9cH6SQTnr86sLIqMkkwUx0KfUUFfOZMT3QaV1xoj/HOpU46yI0gW/ E2ubzHtbwKL108GGw6oe8VEiqbtyb4Xpq6mSmuo6/fDaHi9qUaJSg3GPj2K/y8hyw2NN n6nnzVGRsTMa8OPcEGDrrvbjT0Yta8ZmIfBIYvwXZLC9PRuMFVM82q+fegXo8ztEeBeP J6OpcI7nK90rQlAO3zL53qkDtM9ZmagAUMci/WuIPL/byoFE+FZJmZBLHO2F9ZYGGBr3 gAgw== X-Gm-Message-State: AOJu0YxRlSCmM9G9vXKGx4KU1HDAwWNa4jjwU1KBWE79uPwu07kXl8oi CuLuYCtviThcgnh8XUa85Ay2mKoSg2xJsv2aeV4= X-Received: by 2002:a05:6512:459:b0:500:9704:3c9 with SMTP id y25-20020a056512045900b00500970403c9mr2512839lfk.26.1692869323008; Thu, 24 Aug 2023 02:28:43 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id s12-20020adfeccc000000b00317b5c8a4f1sm21844004wro.60.2023.08.24.02.28.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Aug 2023 02:28:42 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/35] accel/kvm: Free as when an error occurred Date: Thu, 24 Aug 2023 10:28:12 +0100 Message-Id: <20230824092836.2239644-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230824092836.2239644-1-peter.maydell@linaro.org> References: <20230824092836.2239644-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=peter.maydell@linaro.org; helo=mail-lf1-x12f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Akihiko Odaki An error may occur after s->as is allocated, for example if the KVM_CREATE_VM ioctl call fails. Signed-off-by: Akihiko Odaki Message-id: 20230727073134.134102-6-akihiko.odaki@daynix.com Reviewed-by: Peter Maydell [PMM: tweaked commit message] Signed-off-by: Peter Maydell --- accel/kvm/kvm-all.c | 1 + 1 file changed, 1 insertion(+) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 3bac5aa678b..ed30f4135b5 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2765,6 +2765,7 @@ err: if (s->fd != -1) { close(s->fd); } + g_free(s->as); g_free(s->memory_listener.slots); return ret;