From: "Daniel P. Berrangé" <berrange@redhat.com> To: qemu-devel@nongnu.org Cc: "Laurent Vivier" <laurent@vivier.eu>, "Riku Voipio" <riku.voipio@iki.fi>, "Gerd Hoffmann" <kraxel@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/5] linux-user: avoid string truncation warnings in uname field copying Date: Fri, 12 Apr 2019 13:16:22 +0100 [thread overview] Message-ID: <20190412121626.19829-2-berrange@redhat.com> (raw) In-Reply-To: <20190412121626.19829-1-berrange@redhat.com> In file included from /usr/include/string.h:494, from include/qemu/osdep.h:101, from linux-user/uname.c:20: In function ‘strncpy’, inlined from ‘sys_uname’ at linux-user/uname.c:94:3: /usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ output may be truncated copying 64 bytes from a string of length 64 [-Wstringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We don't care where the NUL terminator in the original uname field was. It suffices to copy the entire original field and simply force a NUL terminator at the end of the new field. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- linux-user/uname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/uname.c b/linux-user/uname.c index 313b79dbad..3dff33effe 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -73,7 +73,7 @@ const char *cpu_to_uname_machine(void *cpu_env) #define COPY_UTSNAME_FIELD(dest, src) \ do { \ /* __NEW_UTS_LEN doesn't include terminating null */ \ - (void) strncpy((dest), (src), __NEW_UTS_LEN); \ + memcpy((dest), (src), MIN(sizeof(src), __NEW_UTS_LEN)); \ (dest)[__NEW_UTS_LEN] = '\0'; \ } while (0) -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: "Daniel P. Berrangé" <berrange@redhat.com> To: qemu-devel@nongnu.org Cc: Riku Voipio <riku.voipio@iki.fi>, Laurent Vivier <laurent@vivier.eu>, Gerd Hoffmann <kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/5] linux-user: avoid string truncation warnings in uname field copying Date: Fri, 12 Apr 2019 13:16:22 +0100 [thread overview] Message-ID: <20190412121626.19829-2-berrange@redhat.com> (raw) Message-ID: <20190412121622.9OPPnHUCX4PE36Q8zYXTRxDEwbU1r6sdsUywyZRlVtE@z> (raw) In-Reply-To: <20190412121626.19829-1-berrange@redhat.com> In file included from /usr/include/string.h:494, from include/qemu/osdep.h:101, from linux-user/uname.c:20: In function ‘strncpy’, inlined from ‘sys_uname’ at linux-user/uname.c:94:3: /usr/include/bits/string_fortified.h:106:10: warning: ‘__builtin_strncpy’ output may be truncated copying 64 bytes from a string of length 64 [-Wstringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We don't care where the NUL terminator in the original uname field was. It suffices to copy the entire original field and simply force a NUL terminator at the end of the new field. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- linux-user/uname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-user/uname.c b/linux-user/uname.c index 313b79dbad..3dff33effe 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -73,7 +73,7 @@ const char *cpu_to_uname_machine(void *cpu_env) #define COPY_UTSNAME_FIELD(dest, src) \ do { \ /* __NEW_UTS_LEN doesn't include terminating null */ \ - (void) strncpy((dest), (src), __NEW_UTS_LEN); \ + memcpy((dest), (src), MIN(sizeof(src), __NEW_UTS_LEN)); \ (dest)[__NEW_UTS_LEN] = '\0'; \ } while (0) -- 2.20.1
next prev parent reply other threads:[~2019-04-12 12:16 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-12 12:16 [Qemu-devel] [PATCH v2 0/5] misc set of fixes for warnings under GCC 9 Daniel P. Berrangé 2019-04-12 12:16 ` Daniel P. Berrangé 2019-04-12 12:16 ` Daniel P. Berrangé [this message] 2019-04-12 12:16 ` [Qemu-devel] [PATCH v2 1/5] linux-user: avoid string truncation warnings in uname field copying Daniel P. Berrangé 2019-04-12 12:28 ` Laurent Vivier 2019-04-12 12:16 ` [Qemu-devel] [PATCH v2 2/5] linux-user: avoid string truncation warnings in elf " Daniel P. Berrangé 2019-04-12 12:16 ` Daniel P. Berrangé 2019-04-12 12:32 ` Laurent Vivier 2019-04-12 12:16 ` [Qemu-devel] [PATCH v2 3/5] sockets: avoid string truncation warnings when copying UNIX path Daniel P. Berrangé 2019-04-12 12:16 ` Daniel P. Berrangé 2019-05-02 15:45 ` Laurent Vivier 2019-05-02 15:48 ` Daniel P. Berrangé 2019-05-02 15:48 ` Daniel P. Berrangé 2019-05-02 16:18 ` Laurent Vivier 2019-04-12 12:16 ` [Qemu-devel] [PATCH v2 4/5] hw/usb: avoid format truncation warning when formatting port name Daniel P. Berrangé 2019-04-12 12:16 ` Daniel P. Berrangé 2019-05-02 6:44 ` Gerd Hoffmann 2019-05-02 6:44 ` Gerd Hoffmann 2019-04-12 12:16 ` [Qemu-devel] [PATCH v2 5/5] qxl: avoid unaligned pointer reads/writes Daniel P. Berrangé 2019-04-12 12:16 ` Daniel P. Berrangé 2019-05-07 7:54 ` Gerd Hoffmann 2019-05-07 8:11 ` Philippe Mathieu-Daudé 2019-05-07 8:53 ` Gerd Hoffmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190412121626.19829-2-berrange@redhat.com \ --to=berrange@redhat.com \ --cc=kraxel@redhat.com \ --cc=laurent@vivier.eu \ --cc=qemu-devel@nongnu.org \ --cc=riku.voipio@iki.fi \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.