From patchwork Tue Dec 18 11:03:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1015282 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 43JwRm756nz9s3q for ; Tue, 18 Dec 2018 22:15:32 +1100 (AEDT) Received: from localhost ([::1]:53148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZDLW-0006pS-Jx for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2018 06:15:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZDEj-00015C-P0 for qemu-devel@nongnu.org; Tue, 18 Dec 2018 06:08:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZDB6-0000FI-4z for qemu-devel@nongnu.org; Tue, 18 Dec 2018 06:04:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57066) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZDB0-0000Ai-5o; Tue, 18 Dec 2018 06:04:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4DFCB8E3D6; Tue, 18 Dec 2018 11:04:37 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67943608C2; Tue, 18 Dec 2018 11:04:04 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2018 12:03:31 +0100 Message-Id: <20181218110333.22558-2-philmd@redhat.com> In-Reply-To: <20181218110333.22558-1-philmd@redhat.com> References: <20181218110333.22558-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 18 Dec 2018 11:04:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 1/3] hw/acpi: Replace strncpy() by strpadcpy(pad='\0') 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: "Michael S. Tsirkin" , Jeff Cody , Paolo Bonzini , Ben Pye , qemu-block@nongnu.org, Juan Quintela , David Hildenbrand , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Stefan Weil , 1803872@bugs.launchpad.net, "Dr. David Alan Gilbert" , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Liu Yuan , David Gibson , Kevin Wolf , Max Reitz , Howard Spoelstra , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau GCC 8 added a -Wstringop-truncation warning: The -Wstringop-truncation warning added in GCC 8.0 via r254630 for bug 81117 is specifically intended to highlight likely unintended uses of the strncpy function that truncate the terminating NUL character from the source string. This new warning leads to compilation failures: CC hw/acpi/core.o In function 'acpi_table_install', inlined from 'acpi_table_add' at qemu/hw/acpi/core.c:296:5: qemu/hw/acpi/core.c:184:9: error: 'strncpy' specified bound 4 equals destination size [-Werror=stringop-truncation] strncpy(ext_hdr->sig, hdrs->sig, sizeof ext_hdr->sig); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make: *** [qemu/rules.mak:69: hw/acpi/core.o] Error 1 The ACPI tables don't require the strings to be NUL-terminated, therefore strncpy is the right function to use here. We could add a #pragma GCC diagnostic ignored "-Wstringop-truncation" around, disable the warning globally using -Wno-stringop-truncation, but since QEMU provides the strpadcpy() which does the same purpose, simply use it to avoid the annoying warning. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé [PMD: reword commit subject and description] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov --- 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..397833462a 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..6e8f4e5713 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) { From patchwork Tue Dec 18 11:03:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1015280 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 43JwM45yNdz9s3q for ; Tue, 18 Dec 2018 22:11:28 +1100 (AEDT) Received: from localhost ([::1]:53121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZDHa-0002y9-CK for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2018 06:11:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZDEW-00015D-3t for qemu-devel@nongnu.org; Tue, 18 Dec 2018 06:08:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZDBf-0000fg-Md for qemu-devel@nongnu.org; Tue, 18 Dec 2018 06:05:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38168) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZDBZ-0000bu-J9; Tue, 18 Dec 2018 06:05:13 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1BE17FD50; Tue, 18 Dec 2018 11:05:12 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A7D267E68; Tue, 18 Dec 2018 11:04:37 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2018 12:03:32 +0100 Message-Id: <20181218110333.22558-3-philmd@redhat.com> In-Reply-To: <20181218110333.22558-1-philmd@redhat.com> References: <20181218110333.22558-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 18 Dec 2018 11:05:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 2/3] block/sheepdog: Replace strncpy() by strpadcpy(pad='\0') 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: "Michael S. Tsirkin" , Jeff Cody , Paolo Bonzini , Ben Pye , qemu-block@nongnu.org, Juan Quintela , David Hildenbrand , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Stefan Weil , 1803872@bugs.launchpad.net, "Dr. David Alan Gilbert" , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Liu Yuan , David Gibson , Kevin Wolf , Max Reitz , Howard Spoelstra , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" GCC 8 added a -Wstringop-truncation warning: The -Wstringop-truncation warning added in GCC 8.0 via r254630 for bug 81117 is specifically intended to highlight likely unintended uses of the strncpy function that truncate the terminating NUL character from the source string. This new warning leads to compilation failures: CC block/sheepdog.o qemu/block/sheepdog.c: In function 'find_vdi_name': qemu/block/sheepdog.c:1239:5: error: 'strncpy' specified bound 256 equals destination size [-Werror=stringop-truncation] strncpy(buf + SD_MAX_VDI_LEN, tag, SD_MAX_VDI_TAG_LEN); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make: *** [qemu/rules.mak:69: block/sheepdog.o] Error 1 As described previous to the strncpy() calls, the use of strncpy() is correct here: /* This pair of strncpy calls ensures that the buffer is zero-filled, * which is desirable since we'll soon be sending those bytes, and * don't want the send_req to read uninitialized data. */ strncpy(buf, filename, SD_MAX_VDI_LEN); strncpy(buf + SD_MAX_VDI_LEN, tag, SD_MAX_VDI_TAG_LEN); We could add a #pragma GCC diagnostic ignored "-Wstringop-truncation" around, disable the warning globally using -Wno-stringop-truncation, but since QEMU provides the strpadcpy() which does the same purpose, simply use it to avoid the annoying warning. Reported-by: Howard Spoelstra Buglink: https://bugs.launchpad.net/qemu/+bug/1803872 Signed-off-by: Philippe Mathieu-Daudé --- block/sheepdog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/sheepdog.c b/block/sheepdog.c index 0125df9d49..72e1aef6ea 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1231,12 +1231,12 @@ static int find_vdi_name(BDRVSheepdogState *s, const char *filename, return fd; } - /* This pair of strncpy calls ensures that the buffer is zero-filled, + /* This pair of strpadcpy calls ensures that the buffer is zero-filled, * which is desirable since we'll soon be sending those bytes, and * don't want the send_req to read uninitialized data. */ - strncpy(buf, filename, SD_MAX_VDI_LEN); - strncpy(buf + SD_MAX_VDI_LEN, tag, SD_MAX_VDI_TAG_LEN); + strpadcpy(buf, SD_MAX_VDI_LEN, filename, '\0'); + strpadcpy(buf + SD_MAX_VDI_LEN, SD_MAX_VDI_TAG_LEN, tag, '\0'); memset(&hdr, 0, sizeof(hdr)); if (lock) { From patchwork Tue Dec 18 11:03:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1015279 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 43JwHt6Yg4z9s3q for ; Tue, 18 Dec 2018 22:08:41 +1100 (AEDT) Received: from localhost ([::1]:53094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZDEr-00015h-7b for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2018 06:08:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZDER-00015C-He for qemu-devel@nongnu.org; Tue, 18 Dec 2018 06:08:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZDCM-00014v-Hy for qemu-devel@nongnu.org; Tue, 18 Dec 2018 06:06:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46996) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZDCA-0000v7-V5; Tue, 18 Dec 2018 06:05:52 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B46BB13ABEB; Tue, 18 Dec 2018 11:05:45 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.65]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71FC7608C2; Tue, 18 Dec 2018 11:05:13 +0000 (UTC) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 18 Dec 2018 12:03:33 +0100 Message-Id: <20181218110333.22558-4-philmd@redhat.com> In-Reply-To: <20181218110333.22558-1-philmd@redhat.com> References: <20181218110333.22558-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 18 Dec 2018 11:05:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/3] migration: Replace strncpy() by strpadcpy(pad='\0') 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: "Michael S. Tsirkin" , Jeff Cody , Paolo Bonzini , Ben Pye , qemu-block@nongnu.org, Juan Quintela , David Hildenbrand , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Stefan Weil , 1803872@bugs.launchpad.net, "Dr. David Alan Gilbert" , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Liu Yuan , David Gibson , Kevin Wolf , Max Reitz , Howard Spoelstra , Igor Mammedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" GCC 8 added a -Wstringop-truncation warning: The -Wstringop-truncation warning added in GCC 8.0 via r254630 for bug 81117 is specifically intended to highlight likely unintended uses of the strncpy function that truncate the terminating NUL character from the source string. This new warning leads to compilation failures: CC migration/global_state.o qemu/migration/global_state.c: In function 'global_state_store_running': qemu/migration/global_state.c:45:5: error: 'strncpy' specified bound 100 equals destination size [-Werror=stringop-truncation] strncpy((char *)global_state.runstate, state, sizeof(global_state.runstate)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ make: *** [qemu/rules.mak:69: migration/global_state.o] Error 1 The runstate name doesn't require the strings to be NUL-terminated, therefore strncpy is the right function to use here. We could add a #pragma GCC diagnostic ignored "-Wstringop-truncation" around, disable the warning globally using -Wno-stringop-truncation, but since QEMU provides the strpadcpy() which does the same purpose, simply use it to avoid the annoying warning. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marc-André Lureau --- migration/global_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/global_state.c b/migration/global_state.c index 8e8ab5c51e..c7e7618118 100644 --- a/migration/global_state.c +++ b/migration/global_state.c @@ -42,8 +42,8 @@ int global_state_store(void) void global_state_store_running(void) { const char *state = RunState_str(RUN_STATE_RUNNING); - strncpy((char *)global_state.runstate, - state, sizeof(global_state.runstate)); + strpadcpy((char *)global_state.runstate, + sizeof(global_state.runstate), state, '\0'); } bool global_state_received(void)