From patchwork Thu Jul 13 20:26:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 107707 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2676514qge; Thu, 13 Jul 2017 13:26:57 -0700 (PDT) X-Received: by 10.84.224.11 with SMTP id r11mr11883224plj.267.1499977617592; Thu, 13 Jul 2017 13:26:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499977617; cv=none; d=google.com; s=arc-20160816; b=LQBX0GobKWw4Twc1bwX2BCInE4Q9J3dSzGIYAX7wGxIa1O5+D8H1gcypOyWzn5DH2s N4SrrweFEfrntQVMabeJ4PIWZ01rfqIQxCjmlszG/pRf1SB3cpGiGVtlJLCDTE0dVaMS t5pS64dgJ+ccavOJvs+0VpzZK3JsP2vPkKUnJLdiQjIl06JFI69LHcZn8q/F096XS3Xi /fFoaI9hcIhObQNS5uwX54EMz08S3F3Tm4HVe4rfJ/1STK6s1MXJdDa/XHb31CdN4Q8q Alv4gx5PzzSV6Lj4sD45ks2azlOJ9A4FBLomio1j4g57J7FK8LWXi77K6vCkMM3USXoR NoIQ== 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=JGOhi8m43Q/Wzzzf4qsEBM5Pghf2ZvvZtswxiJpRib0=; b=YJCbRGV8K1IjFxuG5Rh5zlLnC92V7iSNBde3JSuE9UXQsGun/9YtWCUD9skO24JCu0 26XHDOBfZWVLMt+YkeKI2Qct8KQcbTOrAfAlKNki3l5o54ut9phd379iMJXiAcln+RUu NHDlCq8VumjU4rcgqDXRjiKAKOuCfXeq9mrSuzbEgtLtIcMR0TEqbW+X6VXL2ErG6mgn FaEFiDygk9yFntBdeyaO2xGBmzodaGbBvf1VY4MqLAAX/7vRccJkmZfvwpp+oNcy4dqD jUkTaUW0/UGQsPD8XwIgjwIypXNi9r81QPWNA2FwWENJqzPEFYnHT7+Ba7sZJdEwGXtW 4MuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.b=mNj448eu; spf=pass (google.com: domain of libc-alpha-return-82112-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-82112-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 v26si4911271pgc.458.2017.07.13.13.26.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 13:26:57 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-82112-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.b=mNj448eu; spf=pass (google.com: domain of libc-alpha-return-82112-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-82112-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=E4n3LNIAgCXRR52RKJfF5o2pcfapkcEX03EPlzgLJ0/UxgAp3XzGW 26cl2Tx4Q6KbmgEZuppCbhCZzud9scW4Q0kjlV/rVpcCHP+xPk7e3r9anNraGkO9 OOhE3aoSLBy7bxP96lfZkLF2pJXXf9X57T/0mxDz0E1AXenCaa4bUM= 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=b4hSMBPiDDS6hyDpWzWvfJlXHkY=; b=mNj448euXxBjHg8lkM4XBKVYxwwg kxTB96xIOW6IxZA2Vva2A9oJT7E11J+WCP+jOdDesvLD0LEBLWefZEOdft43MMM6 cEOMb/RUrbSel/NiINgcJepttD+F7VSmfAw++kl/AH9dhClZ4/0+Ei2sifb5tGg2 ZvS6IE4A3lX3YxA= Received: (qmail 7126 invoked by alias); 13 Jul 2017 20:26:37 -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 7100 invoked by uid 89); 13 Jul 2017 20:26:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f180.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=JGOhi8m43Q/Wzzzf4qsEBM5Pghf2ZvvZtswxiJpRib0=; b=Qu0QtkwzWwJZXWIUz7bMJB/2ZDsdMV7WXqIBKh07dT5hWVe6gTwQbax+H1nVYrgcb7 J/KdlztXX3vwdc5SB5W9JUmU2JVs0LZAfQz806INP43iC2oQuiOCmgOCtlU1245ER1E6 Pdk3jjPcdtbqVfyU95aiGWJLbhYxfm+2U1NxGiwPjMTX19hOoNV3z60H4rK4sDxk+S8T NGf+xwLyugXM20eTt6MGltjI+80i9oqXlHaZ4h5JG4hTe6AdTFJpDyXPx6ViGBEOfJiH 91+P6Rs6eMv8vG+ks39U7ZJbc/k2xf5BLYrcbAvLVuRV/tqZFonrk2QK6s2l2HolJWaK llGw== X-Gm-Message-State: AIVw112Vzv86/1tvszmUArTKq+v9plIwSahlHcWKPP3kIXgx3WzJc102 rKGiYqfhcduM2q7jABXsAA== X-Received: by 10.55.180.197 with SMTP id d188mr7494912qkf.181.1499977592428; Thu, 13 Jul 2017 13:26:32 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH] libio: Flush stream at freopen (BZ#21037) Date: Thu, 13 Jul 2017 17:26:27 -0300 Message-Id: <1499977587-28794-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. >From Florian's comment, this is intended for 2.27. This patch should be applied on top on 'libio: Fix open_memstream fflush (NULL) (BZ#21735)' [2]. [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/ [2] https://sourceware.org/ml/libc-alpha/2017-07/msg00548.html --- 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 6ee809a..8adf2d8 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -58,8 +58,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 diff --git a/libio/freopen.c b/libio/freopen.c index 980523a..505e77d 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 1e56de6..28203c9 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 fe15f5d..db594f2 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 414a30f..6cd0bdd 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; }