From patchwork Wed Jun 13 21:33:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 138511 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1259783lji; Wed, 13 Jun 2018 14:33:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKN3g5XO7T4yVA1Uc985jdFUI8Y8L52RfPjRudLGI8XuqaOZ2cHoRef2dsocuPrpa2Otmur X-Received: by 2002:a63:bd51:: with SMTP id d17-v6mr1850146pgp.42.1528925613966; Wed, 13 Jun 2018 14:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528925613; cv=none; d=google.com; s=arc-20160816; b=bE++JnuhBkhPkgqVcAfq5xN46XNWtiEiKlupbpQxz5DcmkYpzucTYyC8lJLrFFifU+ zXtdLUjvklwZksGC/76HJgnn7c6oQ+s8Rjk7qNgkJEjCUhGg7Iy+8Pule7K+yc820ZOU yeZVG0/q8rirKz/ifPOUKMCfMjdwkG8zQ8cVcJb9SoAd/760EqRFBIYhf1r9jTM7fA/o z4arMWYifDSzhfL1/xYVkairfaDK6ILPpV/a/keEOCtKnnUGQXnpuER+xFp6NDzOAF0/ PTSdvPL8XYG1xSfr7aRjr2qqH1uR5LJmh7LDQgYxQbbuBw9u5PNaJmUwPfKlAB/EJ5EG uWSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:to:from:delivered-to:sender:list-help :list-post:list-archive:list-subscribe:list-unsubscribe:list-id :precedence:mailing-list:dkim-signature:domainkey-signature :arc-authentication-results; bh=I7NrkjRLqqH3sfD5VQLPHhUlbdKQFaHXFdumbIheMQ8=; b=p5hdHgeWOPmc2f3I4yAIhOSiZfcv00rnJXlkt3ABFmM1vwFd3T1t921I+MHvdZqh+w sxX280PiAOILMOX4y+hHONiRU2vySY1v9nlAjtsGsAWSGZk50KS+DXOxVcHLT8niPt+q oAeD6GfqE9Ae7p4ypxEQBpZfWtP5G2MguPNv7rI1B4Cy6qrOD7kmi460GI9SKPD0bNzt FLmxAmA2ZLOazWCYYwJfEfZEfF9OTWCTh7C/RBw1OaO+4k9AQnrpj8/b7xalIPrhDHSX zvLwqqmRcoDSRmktbMwm9KEg0Vu+wdx8GQlarFhM54jZRaRi9liAMIy2fDcBhPer3qkW hEvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=J+dx98k5; spf=pass (google.com: domain of libc-alpha-return-93211-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-93211-patch=linaro.org@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id d11-v6si3641484pll.255.2018.06.13.14.33.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 14:33:33 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-93211-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=J+dx98k5; spf=pass (google.com: domain of libc-alpha-return-93211-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-93211-patch=linaro.org@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=C+LDO/hIVbhBuaBT6XCweyinBUrHFejGjZ6l3eRSGEAnP2HB2Ajt2 xvidn3NgSA/noprPC0vPDYacZffGYzZY0J64ooX+THB/DcjFSZnIIUqLuRFzNE+t ic8bt/o7b0rd6xbnyRrvFHg/6i3xbcQj4zpXeTCTEN+mohA5q01LWA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=IrSRpEM71jGaxn+KYxHFIy9QG1o=; b=J+dx98k5Z6IEbNFTSVDTkzFF4etb b+SCyxLAQQXsthCQqkOZBfYnE48oXED6ckD6+DeeqA/kkteG39Q7PyEE3RDh4pZ3 LOWvZrZbswj+FuFG+SpiAzzf/usOYIbgYstKHxFiPolw/lzYBz/wNpoUBUfIqezk FOVexm5FfJXbmyI= Received: (qmail 97768 invoked by alias); 13 Jun 2018 21:33:24 -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 97758 invoked by uid 89); 13 Jun 2018 21:33:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=holders X-HELO: mail-qt0-f175.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=I7NrkjRLqqH3sfD5VQLPHhUlbdKQFaHXFdumbIheMQ8=; b=PitzZb46LwxSPitsALxA9gYt9JcYGwmpJ4FaMpti9apCOXTiv8YUp29Alau5Jg0j9h Jg9gDO+l+2D2TCKhG2O1NCjRrK6AxFi6kUdd8QoIkAj+aGISkLJ95IbGCJRuAGpx19Od b6UymcHcToB5RPN4GLkpeaZM1dYVp0V/4JxjNMzdau4WlRBoXuN9tphhJ7lul1rOQSQ8 0LsJw3TLKWPZtD7xmftxsdo2HHazN1MFSpkV3uilQf+CKGYy7oGM3ndavdYj2Icokypd +bV4TPsY19qXQjut+x0O5d0CU1HIJECU0OQfnmNvuqp2j8riswdIP0TVuPjUmjqXpFuM tGog== X-Gm-Message-State: APt69E06GRW4YfJLuReEFzN38wVe3H7xM1rSNAc9zIes5kPMKLVKRSgX LofzfciEi1zRiPLwm3z8vSJVN35j6pM= X-Received: by 2002:a0c:e90f:: with SMTP id a15-v6mr6075313qvo.165.1528925599337; Wed, 13 Jun 2018 14:33:19 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2] libio: Flush stream at freopen (BZ#21037) Date: Wed, 13 Jun 2018 18:33:10 -0300 Message-Id: <1528925590-29895-1-git-send-email-adhemerval.zanella@linaro.org> As POSIX states [1] a freopen call should first flush the stream as if by a call fflush. C99 (n1256) and C11 (n1570) only states the function should first close any file associated with the specific stream. Although current implementation only follow C specification, current BSD and other libc implementation (musl) are in sync with POSIX and fflush the stream. This patch change freopen{64} to fflush the stream before actually reopening it (or returning if the stream does not support reopen). It also changes the Linux implementation to avoid a dynamic allocation on 'fd_to_filename'. Checked on x86_64-linux-gnu. [BZ #21037] * libio/freopen.c (freopen): Sync stream before reopen and adjust to new fd_to_filename interface. * libio/freopen64.c (freopen64): Likewise. * sysdeps/generic/fd_to_filename.h (fd_to_filename): Change signature. * sysdeps/unix/sysv/linux/fd_to_filename.h (fd_to_filename): Likewise and remove internal dynamic allocation. * libio/Makefile (tests): Add tst-memstream5 and tst-wmemstream5. * libio/tst-memstream.h (FPUTS): New macro. * libio/tst-memstream4.c: New file. * libio/tst-wmemstream4.c: Likewise. [1] http://pubs.opengroup.org/onlinepubs/9699919799/ --- ChangeLog | 14 ++++++++ libio/Makefile | 3 +- libio/freopen.c | 33 ++++++++++------- libio/freopen64.c | 30 ++++++++++------ libio/tst-memstream.h | 2 ++ libio/tst-memstream5.c | 62 ++++++++++++++++++++++++++++++++ libio/tst-wmemstream5.c | 20 +++++++++++ sysdeps/generic/fd_to_filename.h | 6 ++-- sysdeps/unix/sysv/linux/fd_to_filename.h | 31 +++++----------- 9 files changed, 151 insertions(+), 50 deletions(-) create mode 100644 libio/tst-memstream5.c create mode 100644 libio/tst-wmemstream5.c -- 2.7.4 diff --git a/libio/Makefile b/libio/Makefile index 077bd40..5b2308e 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -60,8 +60,9 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \ tst-mmap2-eofsync tst-mmap-offend bug-fopena+ bug-wfflush \ bug-ungetc2 bug-ftell bug-ungetc3 bug-ungetc4 tst-fopenloc2 \ tst-memstream1 tst-memstream2 tst-memstream3 tst-memstream4 \ + tst-memstream5 \ tst-wmemstream1 tst-wmemstream2 tst-wmemstream3 tst-wmemstream4 \ - bug-memstream1 bug-wmemstream1 \ + tst-wmemstream5 bug-memstream1 bug-wmemstream1 \ tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \ tst-fwrite-error tst-ftell-partial-wide tst-ftell-active-handler \ tst-ftell-append tst-fputws tst-bz22415 tst-fgetc-after-eof diff --git a/libio/freopen.c b/libio/freopen.c index abf19e9..fa63429 100644 --- a/libio/freopen.c +++ b/libio/freopen.c @@ -24,28 +24,38 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include "libioP.h" -#include "stdio.h" +#include #include #include #include -#include +#include #include - -#include +#include FILE * freopen (const char *filename, const char *mode, FILE *fp) { - FILE *result; + FILE *result = NULL; + char fdfilename[30]; + CHECK_FILE (fp, NULL); - if (!(fp->_flags & _IO_IS_FILEBUF)) - return NULL; + _IO_acquire_lock (fp); + /* First flush the stream (failure should be ignored). */ + _IO_SYNC (fp); + + if (!(fp->_flags & _IO_IS_FILEBUF)) + goto end; + int fd = _IO_fileno (fp); - const char *gfilename = (filename == NULL && fd >= 0 - ? fd_to_filename (fd) : filename); + const char *gfilename; + if (filename == NULL && fd >= 0) + gfilename = fd_to_filename (fd, fdfilename, sizeof fdfilename) + ? fdfilename : NULL; + else + gfilename = filename; + fp->_flags2 |= _IO_FLAGS2_NOCLOSE; #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) if (&_IO_stdin_used == NULL) @@ -101,9 +111,6 @@ freopen (const char *filename, const char *mode, FILE *fp) __close (fd); end: - if (filename == NULL) - free ((char *) gfilename); - _IO_release_lock (fp); return result; } diff --git a/libio/freopen64.c b/libio/freopen64.c index ea7ebd3..1daeba6 100644 --- a/libio/freopen64.c +++ b/libio/freopen64.c @@ -24,27 +24,37 @@ This exception applies to code released by its copyright holders in files containing the exception. */ -#include "libioP.h" -#include "stdio.h" +#include #include #include #include +#include #include -#include - FILE * freopen64 (const char *filename, const char *mode, FILE *fp) { - FILE *result; + FILE *result = NULL; + char fdfilename[30]; + CHECK_FILE (fp, NULL); - if (!(fp->_flags & _IO_IS_FILEBUF)) - return NULL; + _IO_acquire_lock (fp); + /* First flush the stream (failure should be ignored). */ + _IO_SYNC (fp); + + if (!(fp->_flags & _IO_IS_FILEBUF)) + goto end; + int fd = _IO_fileno (fp); - const char *gfilename = (filename == NULL && fd >= 0 - ? fd_to_filename (fd) : filename); + const char *gfilename; + if (filename == NULL && fd >= 0) + gfilename = fd_to_filename (fd, fdfilename, sizeof fdfilename) + ? fdfilename : NULL; + else + gfilename = filename; + fp->_flags2 |= _IO_FLAGS2_NOCLOSE; _IO_file_close_it (fp); _IO_JUMPS_FILE_plus (fp) = &_IO_file_jumps; @@ -84,8 +94,6 @@ freopen64 (const char *filename, const char *mode, FILE *fp) __close (fd); end: - if (filename == NULL) - free ((char *) gfilename); _IO_release_lock (fp); return result; } diff --git a/libio/tst-memstream.h b/libio/tst-memstream.h index ffc2a65..86ea0d7 100644 --- a/libio/tst-memstream.h +++ b/libio/tst-memstream.h @@ -49,6 +49,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq) # define PRINTF wprintf # define FWRITE fwwrite # define FPUTC fputwc +# define FPUTS fputws # define STRCMP wcscmp # define STRLEN wcslen #else @@ -58,6 +59,7 @@ fwwrite (const void *ptr, size_t size, size_t nmemb, FILE *arq) # define PRINTF printf # define FWRITE fwrite # define FPUTC fputc +# define FPUTS fputs # define STRCMP strcmp # define STRLEN strlen #endif diff --git a/libio/tst-memstream5.c b/libio/tst-memstream5.c new file mode 100644 index 0000000..7c1f37c --- /dev/null +++ b/libio/tst-memstream5.c @@ -0,0 +1,62 @@ +/* Test for open_memstream BZ #21037. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include "tst-memstream.h" + +static void +mcheck_abort (enum mcheck_status ev) +{ + printf ("mecheck failed with status %d\n", (int) ev); + exit (1); +} + +static int +do_test (void) +{ + mcheck_pedantic (mcheck_abort); + + /* Check if freopen proper fflush the stream. */ + { + CHAR_T old[] = W("old"); + CHAR_T *buf = old; + size_t size; + + FILE *fp = OPEN_MEMSTREAM (&buf, &size); + TEST_VERIFY_EXIT (fp != NULL); + + FPUTS (W("new"), fp); + /* The stream buffer pointer should be updated with only a fflush or + fclose. */ + TEST_VERIFY (STRCMP (buf, old) == 0); + + /* The old stream should be fflush the stream, even for an invalid + streams. */ + FILE *nfp = freopen ("invalid-file", "r", fp); + TEST_VERIFY (nfp == NULL); + + TEST_VERIFY (STRCMP (buf, W("new")) == 0); + + TEST_VERIFY (fclose (fp) == 0); + + free (buf); + } + + return 0; +} + +#include diff --git a/libio/tst-wmemstream5.c b/libio/tst-wmemstream5.c new file mode 100644 index 0000000..4e87289 --- /dev/null +++ b/libio/tst-wmemstream5.c @@ -0,0 +1,20 @@ +/* Test for open_wmemstream BZ #21037. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define TEST_WCHAR +#include diff --git a/sysdeps/generic/fd_to_filename.h b/sysdeps/generic/fd_to_filename.h index bacfe5b..c60be86 100644 --- a/sysdeps/generic/fd_to_filename.h +++ b/sysdeps/generic/fd_to_filename.h @@ -18,8 +18,8 @@ /* In general there is no generic way to query filename for an open file descriptor. */ -static inline const char * -fd_to_filename (int fd) +static inline bool +fd_to_filename (int fd, char *buf, size_t len) { - return NULL; + return false; } diff --git a/sysdeps/unix/sysv/linux/fd_to_filename.h b/sysdeps/unix/sysv/linux/fd_to_filename.h index 297716b..8381f6d 100644 --- a/sysdeps/unix/sysv/linux/fd_to_filename.h +++ b/sysdeps/unix/sysv/linux/fd_to_filename.h @@ -16,30 +16,17 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#include #include -#include <_itoa.h> -static inline const char * -fd_to_filename (int fd) +static inline bool +fd_to_filename (int fd, char *buf, size_t len) { - char *ret = malloc (30); + __snprintf (buf, len, "/proc/self/fd/%d", fd); - if (ret != NULL) - { - struct stat64 st; - - *_fitoa_word (fd, __stpcpy (ret, "/proc/self/fd/"), 10, 0) = '\0'; - - /* We must make sure the file exists. */ - if (__lxstat64 (_STAT_VER, ret, &st) < 0) - { - /* /proc is not mounted or something else happened. Don't - return the file name. */ - free (ret); - ret = NULL; - } - } - return ret; + /* We must make sure the file exists. */ + if (__lxstat64 (_STAT_VER, buf, & (struct stat64) {}) < 0) + /* /proc is not mounted or something else happened. */ + return false; + return true; }