[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 46/49] block/sheepdog: Use QEMU_NONSTRING for non
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 46/49] block/sheepdog: Use QEMU_NONSTRING for non NUL-terminated arrays |
Date: |
Tue, 15 Jan 2019 15:06:15 -0500 |
From: Philippe Mathieu-Daudé <address@hidden>
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);
Use the QEMU_NONSTRING attribute, since this array is intended to store
character arrays that do not necessarily contain a terminating NUL.
Suggested-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
block/sheepdog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 90ab43baa4..ed14f7afbe 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -1224,7 +1224,7 @@ static int find_vdi_name(BDRVSheepdogState *s, const char
*filename,
SheepdogVdiReq hdr;
SheepdogVdiRsp *rsp = (SheepdogVdiRsp *)&hdr;
unsigned int wlen, rlen = 0;
- char buf[SD_MAX_VDI_LEN + SD_MAX_VDI_TAG_LEN];
+ char buf[SD_MAX_VDI_LEN + SD_MAX_VDI_TAG_LEN] QEMU_NONSTRING;
fd = connect_to_sdog(s, errp);
if (fd < 0) {
--
MST
- [Qemu-devel] [PULL v2 41/49] acpi: add ACPI memory clear interface, (continued)
- [Qemu-devel] [PULL v2 41/49] acpi: add ACPI memory clear interface, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 20/49] virtio: split virtio input bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 43/49] hw: acpi: Fix memory hotplug AML generation error, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 23/49] virtio: split virtio 9p bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 30/49] virtio: split virtio serial bits from virtio-pci, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 49/49] migration: Use strnlen() for fixed-size string, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 44/49] acpi: update expected files, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 45/49] qemu/compiler: Define QEMU_NONSTRING, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 47/49] hw/acpi: Use QEMU_NONSTRING for non NUL-terminated arrays, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 48/49] migration: Fix stringop-truncation warning, Michael S. Tsirkin, 2019/01/15
- [Qemu-devel] [PULL v2 46/49] block/sheepdog: Use QEMU_NONSTRING for non NUL-terminated arrays,
Michael S. Tsirkin <=
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Peter Maydell, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Peter Maydell, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Peter Maydell, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Peter Maydell, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2019/01/17
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Igor Mammedov, 2019/01/18
- Re: [Qemu-devel] [PULL v2 00/49] pci, pc, virtio: fixes, features, Peter Maydell, 2019/01/18