From patchwork Tue Nov 20 15:27:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 1000544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42zqQ61Y0Nz9s8F for ; Wed, 21 Nov 2018 02:29:50 +1100 (AEDT) Received: from localhost ([::1]:34328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP7yF-0004Uu-QN for incoming@patchwork.ozlabs.org; Tue, 20 Nov 2018 10:29:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP7xT-0004QY-0v for qemu-devel@nongnu.org; Tue, 20 Nov 2018 10:29:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP7xQ-0005YA-La for qemu-devel@nongnu.org; Tue, 20 Nov 2018 10:28:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:65426) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gP7xH-0005QF-Bx; Tue, 20 Nov 2018 10:28:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1B1C6C050DFB; Tue, 20 Nov 2018 15:28:46 +0000 (UTC) Received: from localhost (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3443660BF6; Tue, 20 Nov 2018 15:28:30 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Date: Tue, 20 Nov 2018 19:27:53 +0400 Message-Id: <20181120152753.10463-4-marcandre.lureau@redhat.com> In-Reply-To: <20181120152753.10463-1-marcandre.lureau@redhat.com> References: <20181120152753.10463-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 20 Nov 2018 15:28:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-3.1? 3/3] acpi: fix stringop-truncation warnings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Juan Quintela , Jeff Cody , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Max Reitz , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Igor Mammedov , Liu Yuan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace strcpy() that don't mind about having dest not ending with NUL char by qemu strpadcpy(). Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé --- hw/acpi/aml-build.c | 6 ++++-- hw/acpi/core.c | 13 +++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index 1e43cd736d..0a64a23e09 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -24,6 +24,7 @@ #include "hw/acpi/aml-build.h" #include "qemu/bswap.h" #include "qemu/bitops.h" +#include "qemu/cutils.h" #include "sysemu/numa.h" static GArray *build_alloc_array(void) @@ -1532,13 +1533,14 @@ build_header(BIOSLinker *linker, GArray *table_data, h->revision = rev; if (oem_id) { - strncpy((char *)h->oem_id, oem_id, sizeof h->oem_id); + strpadcpy((char *)h->oem_id, sizeof h->oem_id, oem_id, 0); } else { memcpy(h->oem_id, ACPI_BUILD_APPNAME6, 6); } if (oem_table_id) { - strncpy((char *)h->oem_table_id, oem_table_id, sizeof(h->oem_table_id)); + strpadcpy((char *)h->oem_table_id, sizeof(h->oem_table_id), + oem_table_id, 0); } else { memcpy(h->oem_table_id, ACPI_BUILD_APPNAME4, 4); memcpy(h->oem_table_id + 4, sig, 4); diff --git a/hw/acpi/core.c b/hw/acpi/core.c index aafdc61648..c1b4dfbfd9 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -31,6 +31,7 @@ #include "qapi/qapi-visit-misc.h" #include "qemu/error-report.h" #include "qemu/option.h" +#include "qemu/cutils.h" struct acpi_table_header { uint16_t _length; /* our length, not actual part of the hdr */ @@ -181,7 +182,7 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, ext_hdr->_length = cpu_to_le16(acpi_payload_size); if (hdrs->has_sig) { - strncpy(ext_hdr->sig, hdrs->sig, sizeof ext_hdr->sig); + strpadcpy(ext_hdr->sig, sizeof ext_hdr->sig, hdrs->sig, 0); ++changed_fields; } @@ -200,12 +201,12 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, ext_hdr->checksum = 0; if (hdrs->has_oem_id) { - strncpy(ext_hdr->oem_id, hdrs->oem_id, sizeof ext_hdr->oem_id); + strpadcpy(ext_hdr->oem_id, sizeof ext_hdr->oem_id, hdrs->oem_id, 0); ++changed_fields; } if (hdrs->has_oem_table_id) { - strncpy(ext_hdr->oem_table_id, hdrs->oem_table_id, - sizeof ext_hdr->oem_table_id); + strpadcpy(ext_hdr->oem_table_id, sizeof ext_hdr->oem_table_id, + hdrs->oem_table_id, 0); ++changed_fields; } if (hdrs->has_oem_rev) { @@ -213,8 +214,8 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, ++changed_fields; } if (hdrs->has_asl_compiler_id) { - strncpy(ext_hdr->asl_compiler_id, hdrs->asl_compiler_id, - sizeof ext_hdr->asl_compiler_id); + strpadcpy(ext_hdr->asl_compiler_id, sizeof ext_hdr->asl_compiler_id, + hdrs->asl_compiler_id, 0); ++changed_fields; } if (hdrs->has_asl_compiler_rev) {