From patchwork Sat Oct 4 02:31:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vladimir A. Nazarenko" X-Patchwork-Id: 3102 Received: (qmail 24996 invoked by alias); 4 Oct 2014 02:31:59 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 24980 invoked by uid 89); 4 Oct 2014 02:31:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: forward3h.mail.yandex.net X-Yandex-Uniq: 050cf8af-7623-4d64-ace9-760b7ce3a3ec Authentication-Results: smtp1h.mail.yandex.net; dkim=pass header.i=@ya.ru From: "Vladimir A. Nazarenko" To: "GNU C . Library" Cc: "Vladimir A. Nazarenko" , Roland McGrath Subject: [PATCH v3] [BZ #17273] fix incorrect mount table entry parsing in __getmntent_r() Date: Sat, 4 Oct 2014 13:31:47 +1100 Message-Id: <1412389907-24058-1-git-send-email-naszar@ya.ru> When mount entry contains only four fields and have more then one space or tab at the and, mp.mnt_freq and mp.mnt_passno will be set to some specific values as side effect from parsing of previus mount entry. It is because sscanf(""," %d %d ", &a, &b) returns -1, but this case is unprocessed. Values of mp.mnt_freq and mp.mnt_passno stays unchanged. This patch is attempt to fix described issue by removing trailing tabs and spaces. [BZ #17273] * misc/mntent_r.c (__getmntent_r): Cut off trailing spaces and tabs from buffer before parsing fstab entry. * misc/tst-mntent.c (main): Add test for mount entry with trailing spaces and tabs. --- misc/mntent_r.c | 6 +++++- misc/tst-mntent.c | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/misc/mntent_r.c b/misc/mntent_r.c index e68ec8e..e0a0b9d 100644 --- a/misc/mntent_r.c +++ b/misc/mntent_r.c @@ -135,7 +135,11 @@ __getmntent_r (FILE *stream, struct mntent *mp, char *buffer, int bufsiz) end_ptr = strchr (buffer, '\n'); if (end_ptr != NULL) /* chop newline */ - *end_ptr = '\0'; + { + while (end_ptr[-1] == ' ' || end_ptr[-1] == '\t') + end_ptr--; + *end_ptr = '\0'; + } else { /* Not the whole line was read. Do it now but forget it. */ diff --git a/misc/tst-mntent.c b/misc/tst-mntent.c index 802b56e..876c89f 100644 --- a/misc/tst-mntent.c +++ b/misc/tst-mntent.c @@ -73,7 +73,27 @@ main (int argc, char *argv[]) puts ("Error while reading written entry back in"); result = 1; } - } + + /* Part III: Entry with whitespaces at the end of a line. */ + rewind (fp); + + fputs ("/foo\\040dir /bar\\040dir auto bind \t \n", fp); + + rewind (fp); + + mnt = getmntent (fp); + + if (strcmp (mnt->mnt_fsname, "/foo dir") != 0 + || strcmp (mnt->mnt_dir, "/bar dir") != 0 + || strcmp (mnt->mnt_type, "auto") != 0 + || strcmp (mnt->mnt_opts, "bind") != 0 + || mnt->mnt_freq != 0 + || mnt->mnt_passno != 0) + { + puts ("Error while reading entry with trailing whitespaces"); + result = 1; + } + } return result; }