forked from pool/glibc
9a39949079
- unwind-ctor.patch: Add missing unwind information to ld.so on powerpc32 (BZ #23707) - old-getdents64.patch: Rewrite __old_getdents64 (BZ #23497) - nss-files-leak.patch: Fix file stream leak in aliases lookup (BZ #23521) - riscv-feholdexcept-setround.patch: Fix rounding save/restore bug - pthread-cond-broadcast-waiters-after-spinning.patch: Fix waiters-after-spinning case (BZ #23538) - regex-uninit-memory-access.patch: fix uninitialized memory access (BZ #23578) - spawni-maybe-script-execute.patch: Fix segfault in maybe_script_execute - gethostid-gethostbyname-failure.patch: Check for NULL value from gethostbyname_r (BZ #23679) - strstr-huge-needle.patch: Fix strstr bug with huge needles (BZ #23637) OBS-URL: https://build.opensuse.org/request/show/638790 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=511
166 lines
5.2 KiB
Diff
166 lines
5.2 KiB
Diff
2018-09-20 Florian Weimer <fweimer@redhat.com>
|
|
|
|
* misc/tst-gethostid.c: New file.
|
|
* misc/Makefile [$(build-shared)] (tests): Add tst-gethostid.
|
|
(tst-gethostid): Link with -ldl.
|
|
|
|
2018-09-20 Mingli Yu <Mingli.Yu@windriver.com>
|
|
|
|
* sysdeps/unix/sysv/linux/gethostid.c (gethostid): Check for NULL
|
|
value from gethostbyname_r.
|
|
|
|
Index: glibc-2.28/misc/Makefile
|
|
===================================================================
|
|
--- glibc-2.28.orig/misc/Makefile
|
|
+++ glibc-2.28/misc/Makefile
|
|
@@ -86,6 +86,11 @@ tests := tst-dirname tst-tsearch tst-fds
|
|
tst-preadvwritev tst-preadvwritev64 tst-makedev tst-empty \
|
|
tst-preadvwritev2 tst-preadvwritev64v2
|
|
|
|
+# Tests which need libdl.
|
|
+ifeq (yes,$(build-shared))
|
|
+tests += tst-gethostid
|
|
+endif
|
|
+
|
|
tests-internal := tst-atomic tst-atomic-long tst-allocate_once
|
|
tests-static := tst-empty
|
|
|
|
@@ -145,3 +150,5 @@ tst-allocate_once-ENV = MALLOC_TRACE=$(o
|
|
$(objpfx)tst-allocate_once-mem.out: $(objpfx)tst-allocate_once.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-allocate_once.mtrace > $@; \
|
|
$(evaluate-test)
|
|
+
|
|
+$(objpfx)tst-gethostid: $(libdl)
|
|
Index: glibc-2.28/misc/tst-gethostid.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.28/misc/tst-gethostid.c
|
|
@@ -0,0 +1,108 @@
|
|
+/* Basic test for gethostid.
|
|
+ Copyright (C) 2018 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/>. */
|
|
+
|
|
+#include <gnu/lib-names.h>
|
|
+#include <nss.h>
|
|
+#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
+#include <string.h>
|
|
+#include <support/namespace.h>
|
|
+#include <support/support.h>
|
|
+#include <support/temp_file.h>
|
|
+#include <support/xdlfcn.h>
|
|
+#include <support/xstdio.h>
|
|
+#include <support/xunistd.h>
|
|
+#include <unistd.h>
|
|
+
|
|
+/* Initial test is run outside a chroot, to increase the likelihood of
|
|
+ success. */
|
|
+static void
|
|
+outside_chroot (void *closure)
|
|
+{
|
|
+ long id = gethostid ();
|
|
+ printf ("info: host ID outside chroot: 0x%lx\n", id);
|
|
+}
|
|
+
|
|
+/* The same, but this time perform a chroot operation. */
|
|
+static void
|
|
+in_chroot (void *closure)
|
|
+{
|
|
+ const char *chroot_path = closure;
|
|
+ xchroot (chroot_path);
|
|
+ long id = gethostid ();
|
|
+ printf ("info: host ID in chroot: 0x%lx\n", id);
|
|
+}
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ support_isolate_in_subprocess (outside_chroot, NULL);
|
|
+
|
|
+ /* Now run the test inside a chroot. */
|
|
+ support_become_root ();
|
|
+ if (!support_can_chroot ())
|
|
+ /* Cannot perform further tests. */
|
|
+ return 0;
|
|
+
|
|
+ /* Only use nss_files. */
|
|
+ __nss_configure_lookup ("hosts", "files");
|
|
+
|
|
+ /* Load the DSO outside of the chroot. */
|
|
+ xdlopen (LIBNSS_FILES_SO, RTLD_LAZY);
|
|
+
|
|
+ char *chroot_dir = support_create_temp_directory ("tst-gethostid-");
|
|
+ support_isolate_in_subprocess (in_chroot, chroot_dir);
|
|
+
|
|
+ /* Tests with /etc/hosts in the chroot. */
|
|
+ {
|
|
+ char *path = xasprintf ("%s/etc", chroot_dir);
|
|
+ add_temp_file (path);
|
|
+ xmkdir (path, 0777);
|
|
+ free (path);
|
|
+ path = xasprintf ("%s/etc/hosts", chroot_dir);
|
|
+ add_temp_file (path);
|
|
+
|
|
+ FILE *fp = xfopen (path, "w");
|
|
+ xfclose (fp);
|
|
+ printf ("info: chroot test with an empty /etc/hosts file\n");
|
|
+ support_isolate_in_subprocess (in_chroot, chroot_dir);
|
|
+
|
|
+ char hostname[1024];
|
|
+ int ret = gethostname (hostname, sizeof (hostname));
|
|
+ if (ret < 0)
|
|
+ printf ("warning: invalid result from gethostname: %d\n", ret);
|
|
+ else if (strlen (hostname) == 0)
|
|
+ puts ("warning: gethostname returned empty string");
|
|
+ else
|
|
+ {
|
|
+ printf ("info: chroot test with IPv6 address in /etc/hosts for: %s\n",
|
|
+ hostname);
|
|
+ fp = xfopen (path, "w");
|
|
+ /* Use an IPv6 address to induce another lookup failure. */
|
|
+ fprintf (fp, "2001:db8::1 %s\n", hostname);
|
|
+ xfclose (fp);
|
|
+ support_isolate_in_subprocess (in_chroot, chroot_dir);
|
|
+ }
|
|
+ free (path);
|
|
+ }
|
|
+ free (chroot_dir);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+#include <support/test-driver.c>
|
|
Index: glibc-2.28/sysdeps/unix/sysv/linux/gethostid.c
|
|
===================================================================
|
|
--- glibc-2.28.orig/sysdeps/unix/sysv/linux/gethostid.c
|
|
+++ glibc-2.28/sysdeps/unix/sysv/linux/gethostid.c
|
|
@@ -102,12 +102,12 @@ gethostid (void)
|
|
{
|
|
int ret = __gethostbyname_r (hostname, &hostbuf,
|
|
tmpbuf.data, tmpbuf.length, &hp, &herr);
|
|
- if (ret == 0)
|
|
+ if (ret == 0 && hp != NULL)
|
|
break;
|
|
else
|
|
{
|
|
/* Enlarge the buffer on ERANGE. */
|
|
- if (herr == NETDB_INTERNAL && errno == ERANGE)
|
|
+ if (ret != 0 && herr == NETDB_INTERNAL && errno == ERANGE)
|
|
{
|
|
if (!scratch_buffer_grow (&tmpbuf))
|
|
return 0;
|