GNU C Library master sources branch master updated. glibc-2.24-649-g41389c4

[siddhesh at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  41389c40499a083c59e68ba281ec87be567f2871 (commit)
      from  3a66b2b0637e439fb0e7a14c6c3d4c58190eec61 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=41389c40499a083c59e68ba281ec87be567f2871

commit 41389c40499a083c59e68ba281ec87be567f2871
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date:   Fri Jan 20 00:45:09 2017 +0530

    Fix environment traversal when an envvar value is empty
    
    The condition when the value of an envvar is empty (not just '\0'),
    the loop in tunables_init gets stuck infinitely because envp is not
    incremented.  Fix that by always incrementing envp in the loop.
    
    Added test case (tst-empty-env.c) verifies the fix when the source is
    configured with --enable-hardcoded-path-in-tests, thanks Josh Stone for
    providing the test case.  Verified on x86_64.
    
    	* elf/dl-tunables (get_next_env): Always advance envp.
    	* stdlib/tst-empty-env.c: New test case.
    	* stdlib/Makefile (tests): Use it.

diff --git a/ChangeLog b/ChangeLog
index e3f3f5f..c59c6a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-01-19  Siddhesh Poyarekar  <siddhesh@sourceware.org>
+
+	* elf/dl-tunables (get_next_env): Always advance envp.
+	* stdlib/tst-empty-env.c: New test case.
+	* stdlib/Makefile (tests): Use it.
+
 2017-01-19  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #21047]
diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
index e0119d1..ba5246a 100644
--- a/elf/dl-tunables.c
+++ b/elf/dl-tunables.c
@@ -80,7 +80,7 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val)
 {
   while (envp != NULL && *envp != NULL)
     {
-      char *envline = *envp;
+      char *envline = *envp++;
       int len = 0;
 
       while (envline[len] != '\0' && envline[len] != '=')
@@ -94,7 +94,7 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val)
       *namelen = len;
       *val = &envline[len + 1];
 
-      return ++envp;
+      return envp;
     }
 
   return NULL;
diff --git a/stdlib/Makefile b/stdlib/Makefile
index 0c09973..5751b5d 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -81,6 +81,9 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
 		   tst-quick_exit tst-thread-quick_exit tst-width	    \
 		   tst-width-stdint tst-strfrom tst-strfrom-locale \
 		   tst-getrandom
+ifeq ($(build-hardcoded-path-in-tests),yes)
+tests += tst-empty-env
+endif
 tests-static	:= tst-secure-getenv
 ifeq ($(have-cxx-thread_local),yes)
 CFLAGS-tst-quick_exit.o = -std=c++11
diff --git a/stdlib/tst-empty-env.c b/stdlib/tst-empty-env.c
new file mode 100644
index 0000000..0b0651d
--- /dev/null
+++ b/stdlib/tst-empty-env.c
@@ -0,0 +1,58 @@
+/* Test that passing a NULL value does not hang environment traversal in
+   tunables.
+   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
+   <http://www.gnu.org/licenses/>.  */
+
+/* The test is useful only when the source is configured with
+   --enable-hardcoded-path-in-tests since otherwise the execve just picks up
+   the system dynamic linker.  */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+
+static int
+do_test (int argc, char **argv)
+{
+  if (argc == 2)
+    return 0;
+
+  char envname[] = "FOOBAR";
+  char *filename = program_invocation_name;
+  char *newargv[] = {filename, filename, NULL};
+  char *newenviron[] = {envname, NULL};
+
+   /* This was reported in Fedora:
+
+      https://bugzilla.redhat.com/show_bug.cgi?id=1414589
+
+      If one of the environment variables has no value, then the environment
+      traversal must skip and also advance to the next environment entry.  The
+      bug in question would cause this test to hang in an infinite loop.  */
+  int ret = execve (filename, newargv, newenviron);
+
+  if (ret != 0)
+    printf ("execve failed: %m");
+
+  /* We will reach here only if we fail execve.  */
+  return 1;
+}
+
+#define TIMEOUT 3
+#define TEST_FUNCTION_ARGV do_test
+#include <support/test-driver.c>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |    6 +++++
 elf/dl-tunables.c      |    4 +-
 stdlib/Makefile        |    3 ++
 stdlib/tst-empty-env.c |   58 ++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 2 deletions(-)
 create mode 100644 stdlib/tst-empty-env.c


hooks/post-receive
-- 
GNU C Library master sources