Received: from eggs.gnu.org ([209.51.188.92]:54232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLqVe-0002fA-2j for qemu-devel@nongnu.org; Wed, 01 May 2019 10:47:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLqVa-0001wS-DT for qemu-devel@nongnu.org; Wed, 01 May 2019 10:46:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35882) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLqVa-0001vX-8R for qemu-devel@nongnu.org; Wed, 01 May 2019 10:46:54 -0400 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 1 May 2019 15:46:46 +0100 Message-Id: <20190501144646.4851-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2] linux-user: avoid string truncation warnings in uname field copying List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laurent Vivier , Riku Voipio , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= In file included from /usr/include/string.h:494, from include/qemu/osdep.h:101, from linux-user/uname.c:20: In function =E2=80=98strncpy=E2=80=99, inlined from =E2=80=98sys_uname=E2=80=99 at linux-user/uname.c:94:3: /usr/include/bits/string_fortified.h:106:10: warning: =E2=80=98__builtin_= strncpy=E2=80=99 output may be truncated copying 64 bytes from a string o= f 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=C3=A9 --- Changed in v2: - Always use sizeof() in preference to __NEW_UTS_LEN linux-user/uname.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/linux-user/uname.c b/linux-user/uname.c index 313b79dbad..1c05f95387 100644 --- a/linux-user/uname.c +++ b/linux-user/uname.c @@ -72,9 +72,8 @@ const char *cpu_to_uname_machine(void *cpu_env) =20 #define COPY_UTSNAME_FIELD(dest, src) \ do { \ - /* __NEW_UTS_LEN doesn't include terminating null */ \ - (void) strncpy((dest), (src), __NEW_UTS_LEN); \ - (dest)[__NEW_UTS_LEN] =3D '\0'; \ + memcpy((dest), (src), MIN(sizeof(src), sizeof(dest))); \ + (dest)[sizeof(dest) - 1] =3D '\0'; \ } while (0) =20 int sys_uname(struct new_utsname *buf) --=20 2.21.0