Message ID | 20220107102526.39238-44-mst@redhat.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=D/xeqVWA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JVhYR6b3qz9sCD for <incoming@patchwork.ozlabs.org>; Fri, 7 Jan 2022 22:57:46 +1100 (AEDT) Received: from localhost ([::1]:42844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1n5nsN-0008Ol-6i for incoming@patchwork.ozlabs.org; Fri, 07 Jan 2022 06:57:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mst@redhat.com>) id 1n5n3y-0001RB-Te for qemu-devel@nongnu.org; Fri, 07 Jan 2022 06:05:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:23028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mst@redhat.com>) id 1n5n3n-0002G5-UE for qemu-devel@nongnu.org; Fri, 07 Jan 2022 06:05:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641553521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=frHd/5g516X/URldKy7BtToYamE3vI32g+batxojBlk=; b=D/xeqVWA6QoEdJbMg4nB2Bg+D1PBvbOJtZRGnrjorrbpgnoaGpTgKGhZNg2TqWbf4g0Db6 yGWUZRoh2WTUBVX/cdP+rEck1cF31XR131WS+focVZfwmW3CqDUzukDVg+RZ6+ZXq9DIuG x5DU56RwcoIBwoLItDlHLxagMdVPUwk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-343-ggWaOORcOqSnXRG5s_SmoQ-1; Fri, 07 Jan 2022 06:05:20 -0500 X-MC-Unique: ggWaOORcOqSnXRG5s_SmoQ-1 Received: by mail-wr1-f71.google.com with SMTP id q2-20020adfab02000000b001a3ed59eb96so2100120wrc.20 for <qemu-devel@nongnu.org>; Fri, 07 Jan 2022 03:05:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=frHd/5g516X/URldKy7BtToYamE3vI32g+batxojBlk=; b=m9+A6dHBd6v+RjabB3Vv1UTT0NByia7NW9x0pB3GBaZyudB/tglMz1jOD2qtGvaAz4 AA+LsDz1Gi7IstRDKVc1BmNVo70JIvFCiNjWUSsZPw/rIrePSP60H/umcnlA+RYjQr5U gkGhHu741EVb+hQug8ELruJ8GK+hRaMnn97lFHnQfDHQ59yfSXkaXVyH5Sls1jCT0E6b 4M7p+qFA91OJnXfplU22NMuWMiyZVgSR24jYRlKyQSeog/KIOs3CBQGDxjX2agi8ivNJ eQIKiaU1SycKULPoDlDE2gvU7ZEbwjpRSzkvDSiZ8d4ZrxfYh+KRjxuQkuigN/3N73UW IhuA== X-Gm-Message-State: AOAM532DIiicilV82OUvv4utGA5OujBFLyZ9fQihxFJq2MZ3aEE+4LCr N8Q4W9khNUFe5Xqetkdzg8QnVqgQk0eG5LQ2RMaMlLaTAhgdj0mWguF2TJb/fUlK+uwj3QQ/c4q Ep03EEbXNN2LExnfVKvP04s9IFWg3+/e2dyVZlERMJvR+2IvYqOkjxgLjBHmH X-Received: by 2002:adf:fb42:: with SMTP id c2mr42684818wrs.168.1641553517277; Fri, 07 Jan 2022 03:05:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJzx+INTrrV0A5nw89oWZXNPzQBrElo7i+j8iosL4IqwZBl+WxD9mwOR2WTgmAeFkFxmf+JC+Q== X-Received: by 2002:adf:fb42:: with SMTP id c2mr42684792wrs.168.1641553517040; Fri, 07 Jan 2022 03:05:17 -0800 (PST) Received: from redhat.com ([2.55.16.192]) by smtp.gmail.com with ESMTPSA id f8sm4995143wry.16.2022.01.07.03.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 03:05:16 -0800 (PST) Date: Fri, 7 Jan 2022 06:05:13 -0500 From: "Michael S. Tsirkin" <mst@redhat.com> To: qemu-devel@nongnu.org Subject: [PULL v2 43/55] acpi: fix QEMU crash when started with SLIC table Message-ID: <20220107102526.39238-44-mst@redhat.com> References: <20220107102526.39238-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20220107102526.39238-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.372, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://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> Cc: Eduardo Habkost <eduardo@habkost.net>, Peter Maydell <peter.maydell@linaro.org>, Richard Henderson <richard.henderson@linaro.org>, qemu-stable@nongnu.org, Denis Lisov <dennis.lissov@gmail.com>, Alexander Tsoy <alexander@tsoy.me>, Paolo Bonzini <pbonzini@redhat.com>, Ani Sinha <ani@anisinha.ca>, Igor Mammedov <imammedo@redhat.com>, Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,v2,01/55] virtio-mem: Don't skip alignment checks when warning about block size
|
expand
|
diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 1e004d0078..3e811bf03c 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -345,8 +345,8 @@ int acpi_get_slic_oem(AcpiSlicOem *oem) struct acpi_table_header *hdr = (void *)(u - sizeof(hdr->_length)); if (memcmp(hdr->sig, "SLIC", 4) == 0) { - oem->id = hdr->oem_id; - oem->table_id = hdr->oem_table_id; + oem->id = g_strndup(hdr->oem_id, 6); + oem->table_id = g_strndup(hdr->oem_table_id, 8); return 0; } } diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 8383b83ee3..0234fe7588 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2723,6 +2723,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) /* Cleanup memory that's no longer used. */ g_array_free(table_offsets, true); + g_free(slic_oem.id); + g_free(slic_oem.table_id); } static void acpi_ram_update(MemoryRegion *mr, GArray *data)