public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Stefan Liebler <stli@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] nis: Fix stringop-truncation warning with -O3 in nis_local_host. Date: Thu, 2 Mar 2023 13:24:16 +0000 (GMT) [thread overview] Message-ID: <20230302132416.67D113858D33@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=1e0c8356f591a62df9725b6c9387da78002ba412 commit 1e0c8356f591a62df9725b6c9387da78002ba412 Author: Stefan Liebler <stli@linux.ibm.com> Date: Tue Feb 28 13:37:35 2023 +0100 nis: Fix stringop-truncation warning with -O3 in nis_local_host. When building with -O3 on s390x/x86_64, I get this stringop-truncation warning which leads to a build fail: In function ‘nis_local_host’, inlined from ‘nis_local_host’ at nis_local_names.c:147:1: nis_local_names.c:171:11: error: ‘strncpy’ output may be truncated copying between 0 and 1023 bytes from a string of length 1024 [-Werror=stringop-truncation] 171 | strncpy (cp, nis_local_directory (), NIS_MAXNAMELEN - len -1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We can just ignore this warning as the hostname + '.' + directory-name + '\0' always fits in __nishostname with length of (NIS_MAXNAMELEN + 1) as there is the runtime check above. Furthermore as we already know the length of the directory-name, we can also just use memcpy to copy the directory-name inclusive the NUL-termination. Note: This werror was introduced with commit 32c7acd46401530fdbd4e98508c9baaa705f8b53 "Replace rawmemchr (s, '\0') with strchr" Reviewed-by: Wilco Dijkstra <Wilco.Dijkstra@arm.com> Diff: --- nis/nis_local_names.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nis/nis_local_names.c b/nis/nis_local_names.c index e685255300..699ca04e66 100644 --- a/nis/nis_local_names.c +++ b/nis/nis_local_names.c @@ -161,15 +161,19 @@ nis_local_host (void) if (cp[-1] == '.') return __nishostname; - if (len + strlen (nis_local_directory ()) + 1 > NIS_MAXNAMELEN) + nis_name local_directory = nis_local_directory (); + size_t local_directory_len = strlen (local_directory); + if (len + 1 + local_directory_len > NIS_MAXNAMELEN) { __nishostname[0] = '\0'; return __nishostname; } + /* We have enough space in __nishostname with length of + (NIS_MAXNAMELEN + 1) for + hostname + '.' + directory-name + '\0'. */ *cp++ = '.'; - strncpy (cp, nis_local_directory (), NIS_MAXNAMELEN - len -1); - __nishostname[NIS_MAXNAMELEN] = '\0'; + memcpy (cp, local_directory, local_directory_len + 1); } }
reply other threads:[~2023-03-02 13:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230302132416.67D113858D33@sourceware.org \ --to=stli@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).