From: "Maciej W. Rozycki" <macro@mips.com>
To: Andreas Schwab <schwab@suse.de>
Cc: <libc-alpha@sourceware.org>
Subject: [PATCH v2] nisplus: Correct pwent parsing issue and resulting compilation error [BZ #23266]
Date: Mon, 18 Jun 2018 16:13:00 -0000 [thread overview]
Message-ID: <alpine.DEB.2.00.1806181657110.20622@tp.orcam.me.uk> (raw)
In-Reply-To: <mvmefh4ayq0.fsf@suse.de>
Copy and null-terminate NIS+ password file UID and GID entries whose
length is non-zero and are not terminated in addition to empty ones,
fixing a bug and a compilation issue causing an error with GCC 8:
nss_nisplus/nisplus-parser.c: In function '_nss_nisplus_parse_pwent':
nss_nisplus/nisplus-parser.c:90:7: error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation]
strncpy (first_unused, numstr, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
nss_nisplus/nisplus-parser.c:106:7: error: 'strncpy' destination unchanged after copying no bytes [-Werror=stringop-truncation]
strncpy (first_unused, numstr, len);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
introduced with commit ac05397075f6:
commit ac05397075f621cfdbe1db527c96167a58b6d18e
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sun Apr 30 07:01:26 2006 +0000
* nis/nss_nisplus/nisplus-parser.c: Minor optimizations and
cleanups. Avoid copying data if it can be used in the old place.
(no mailing list reference available). Obviously regardless of the
recently added compiler diagnostics causing a build error this code has
been long non-functional, so I guess NIS+ servers have been supplying
strings that are non-empty and have already been null-terminated.
Which in turn made it unnecessary to make a null-terminated copy,
masking this bug.
[BZ #23266]
* nis/nss_nisplus/nisplus-parser.c (_nss_nisplus_parse_pwent):
Copy and null-terminate entries that are not terminated in
addition to empty ones.
---
On Mon, 18 Jun 2018, Andreas Schwab wrote:
> I don't think this is correct. If len == 0 then numstr[0] is undefined.
Right, given that this is legacy code, let's take the path of least
resistance and copy the approach from `_nss_nisplus_parse_grent', which is
actually correct and makes sure that numstr[0] == '\0' if len == 0.
OK for this version?
Maciej
---
nis/nss_nisplus/nisplus-parser.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
glibc-nisplus-parse-pwent-len.diff
Index: glibc/nis/nss_nisplus/nisplus-parser.c
===================================================================
--- glibc.orig/nis/nss_nisplus/nisplus-parser.c 2018-06-18 16:54:13.077894266 +0100
+++ glibc/nis/nss_nisplus/nisplus-parser.c 2018-06-18 16:55:04.831413510 +0100
@@ -82,7 +82,7 @@ _nss_nisplus_parse_pwent (nis_result *re
char *numstr = NISOBJVAL (2, obj);
len = NISOBJLEN (2, obj);
- if (len == 0 && numstr[len - 1] != '\0')
+ if (len == 0 || numstr[len - 1] != '\0')
{
if (len >= room_left)
goto no_more_room;
@@ -98,7 +98,7 @@ _nss_nisplus_parse_pwent (nis_result *re
numstr = NISOBJVAL (3, obj);
len = NISOBJLEN (3, obj);
- if (len == 0 && numstr[len - 1] != '\0')
+ if (len == 0 || numstr[len - 1] != '\0')
{
if (len >= room_left)
goto no_more_room;
next prev parent reply other threads:[~2018-06-18 16:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 15:10 [PATCH] nisplus: Correct pwent parsing issue and resulting compilation error Maciej W. Rozycki
2018-06-18 15:25 ` Joseph Myers
2018-06-18 15:45 ` Maciej W. Rozycki
2018-06-18 15:49 ` Joseph Myers
2018-06-18 15:41 ` Andreas Schwab
2018-06-18 16:13 ` Maciej W. Rozycki [this message]
2018-06-18 19:44 ` [PATCH v2] nisplus: Correct pwent parsing issue and resulting compilation error [BZ #23266] DJ Delorie
2018-06-18 20:11 ` Maciej W. Rozycki
2018-06-18 20:40 ` DJ Delorie
2018-06-25 19:17 ` [PING][PATCH " Maciej W. Rozycki
2018-06-26 1:32 ` DJ Delorie
2018-06-27 20:14 ` [committed v3] nisplus: Correct pwent parsing issue and resulting build " Maciej W. Rozycki
2018-06-27 21:03 ` Joseph Myers
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=alpine.DEB.2.00.1806181657110.20622@tp.orcam.me.uk \
--to=macro@mips.com \
--cc=libc-alpha@sourceware.org \
--cc=schwab@suse.de \
/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: link
Be 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).