pool/glibc
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 100533 from Base:System

Browse Source 
Update license (forwarded request 100532 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/100533
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=102
This commit is contained in:
Stephan Kulow 2012-01-19 09:34:43 +00:00 committed by Git OBS Bridge
commit 023b0b26a0
3 changed files with 872 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

801
glibc-revert-netlink-cache.patch Normal file
View File

@ -0,0 +1,801 @@
commit 432d41ceecf5df8cfbc5a1db0cee9190f07ec1ca
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Nov 1 08:43:33 2011 -0400
Use kernel headers for netlink definitions
2011-11-01 Ulrich Drepper <drepper@gmail.com>
* nscd/connections.c: Use kernel headers instead of <netlink/netlink.h>.
diff --git a/nscd/connections.c b/nscd/connections.c
index 1b8a9bd..c741996 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -34,7 +34,8 @@
#include <unistd.h>
#include <arpa/inet.h>
#ifdef HAVE_NETLINK
-# include <netlink/netlink.h>
+# include <linux/netlink.h>
+# include <linux/rtnetlink.h>
#endif
#ifdef HAVE_EPOLL
# include <sys/epoll.h>
commit a501a01e069619676990454abd43c4d2bf4527f4
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Nov 15 07:18:15 2011 -0500
Pretty printing
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index 895dc2a..0738a70 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -273,7 +273,7 @@ make_request (int fd, pid_t pid)
}
else
{
- atomic_add(&noai6ai_cached.usecnt, 2);
+ atomic_add (&noai6ai_cached.usecnt, 2);
noai6ai_cached.seen_ipv4 = seen_ipv4;
noai6ai_cached.seen_ipv6 = seen_ipv6;
result = &noai6ai_cached;
commit 09f93bd3d6b1c41370432e6b7a3c88d0fc482881
Author: Andreas Schwab <schwab@redhat.com>
Date: Tue Nov 15 10:32:18 2011 +0100
Fix reference counting in network interface information cache
2011-11-15 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/check_pf.c (make_request): Properly
count references to noai6ai_cached.
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index 1f66684..895dc2a 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -58,7 +58,7 @@ struct cached_data
static struct cached_data noai6ai_cached =
{
- .usecnt = 3, /* Make sure we never try to delete this entry. */
+ .usecnt = 1, /* Make sure we never try to delete this entry. */
.in6ailen = 0
};
@@ -273,6 +273,7 @@ make_request (int fd, pid_t pid)
}
else
{
+ atomic_add(&noai6ai_cached.usecnt, 2);
noai6ai_cached.seen_ipv4 = seen_ipv4;
noai6ai_cached.seen_ipv6 = seen_ipv6;
result = &noai6ai_cached;
commit 3a2c02424d9824f5cdea4ebd32ff929b2b1f49c6
Author: Ulrich Drepper <drepper@gmail.com>
Date: Mon Oct 31 01:51:16 2011 -0400
Cache network interface information
Whenever getaddrinfo needed network interface information it used the
netlink interface to read the information every single time. The
problem is that this information can change at any time.
The patch implements monitoring of the network interfaces through
nscd. If no change is detected the previously read information can
be reused (which is the norm). This timestamp information is also
made available to other processes using the shared memory segment
between nscd and those processes.
2011-10-31 Ulrich Drepper <drepper@gmail.com>
* include/ifaddrs.h: Declare __free_in6ai and __bump_nl_timestamp.
* inet/check_pf.c: Provide dummy versions of __free_in6ai and
__bump_nl_timestamp.
* nscd/connections (nscd_init): When host database is served open
netlink socket and request notification about configuration changes.
(main_loop_poll): Track netlink file descriptor and bump timestamp
in case data becomes available.
(main_loop_epoll): Likewise.
* nscd/nscd-client.h (DB_VERSION): Bump to 2.
(database_pers_head): Add extra_data fileds.
Declare __nscd_get_mapping and __nscd_get_nl_timestamp.
* nscd/nscd_gethst_r.c (__nscd_get_nl_timestamp): New function.
* nscd/nscd_helper.c (__nscd_get_mapping): Renamed from get_mapping.
Adjust caller.
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Don't call free on
in6ai data, call __free_in6ai.
* sysdeps/unix/sysv/linux/Makefile [subdir=nscd] (sysdep-CFLAGS):
Add -DHAVE_NETLINK.
* sysdeps/unix/sysv/linux/check_pf.c: Major rewrite. Cache the
interface information. Reuse previous data if netlink timestamp
is not changed.
(__bump_nl_timestamp): New function.
(__free_in6ai): New function.
* sysdeps/unix/sysv/linux/check_pf.c (make_request): Don't call
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
index 50e4c48..e1c6cac 100644
--- a/include/ifaddrs.h
+++ b/include/ifaddrs.h
@@ -21,8 +21,13 @@ struct in6addrinfo
extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
struct in6addrinfo **in6ai, size_t *in6ailen)
attribute_hidden;
+extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden;
extern void __check_native (uint32_t a1_index, int *a1_native,
uint32_t a2_index, int *a2_native)
attribute_hidden;
+#ifdef IS_IN_nscd
+extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
+#endif
+
#endif /* ifaddrs.h */
diff --git a/inet/check_pf.c b/inet/check_pf.c
index b015432..0fa34cc 100644
--- a/inet/check_pf.c
+++ b/inet/check_pf.c
@@ -1,5 +1,5 @@
/* Determine protocol families for which interfaces exist. Generic version.
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2011 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
@@ -54,3 +54,19 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
(void) freeifaddrs (ifa);
}
+
+
+void
+__free_in6ai (struct in6addrinfo *in6ai)
+{
+ /* Nothing to do. */
+}
+
+
+#ifdef IS_IN_nscd
+uint32_t
+__bump_nl_timestamp (void)
+{
+ return 0;
+}
+#endif
diff --git a/nscd/connections.c b/nscd/connections.c
index 2b5c7ef..1b8a9bd 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -24,6 +24,7 @@
#include <errno.h>
#include <fcntl.h>
#include <grp.h>
+#include <ifaddrs.h>
#include <libintl.h>
#include <pthread.h>
#include <pwd.h>
@@ -32,6 +33,9 @@
#include <stdlib.h>
#include <unistd.h>
#include <arpa/inet.h>
+#ifdef HAVE_NETLINK
+# include <netlink/netlink.h>
+#endif
#ifdef HAVE_EPOLL
# include <sys/epoll.h>
#endif
@@ -247,6 +251,11 @@ static int sock;
int inotify_fd = -1;
#endif
+#ifdef HAVE_NETLINK
+/* Descriptor for netlink status updates. */
+static int nl_status_fd = -1;
+#endif
+
#ifndef __ASSUME_SOCK_CLOEXEC
/* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero
before be know the result. */
@@ -903,6 +912,65 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
exit (1);
}
+#ifdef HAVE_NETLINK
+ if (dbs[hstdb].enabled)
+ {
+ /* Try to open netlink socket to monitor network setting changes. */
+ nl_status_fd = socket (AF_NETLINK,
+ SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
+ NETLINK_ROUTE);
+ if (nl_status_fd != -1)
+ {
+ struct sockaddr_nl snl;
+ memset (&snl, '\0', sizeof (snl));
+ snl.nl_family = AF_NETLINK;
+ /* XXX Is this the best set to use? */
+ snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE
+ | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE
+ | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE
+ | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO
+ | RTMGRP_IPV6_PREFIX);
+
+ if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0)
+ {
+ close (nl_status_fd);
+ nl_status_fd = -1;
+ }
+ else
+ {
+ /* Start the timestamp process. */
+ dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
+ = __bump_nl_timestamp ();
+
+# ifndef __ASSUME_SOCK_CLOEXEC
+ if (have_sock_cloexec < 0)
+ {
+ /* We don't want to get stuck on accept. */
+ int fl = fcntl (nl_status_fd, F_GETFL);
+ if (fl == -1
+ || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1)
+ {
+ dbg_log (_("\
+cannot change socket to nonblocking mode: %s"),
+ strerror (errno));
+ exit (1);
+ }
+
+ /* The descriptor needs to be closed on exec. */
+ if (paranoia
+ && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1)
+ {
+ dbg_log (_("cannot set socket to close on exec: %s"),
+ strerror (errno));
+ exit (1);
+ }
+ }
+# endif
+ }
+ }
+ }
+#endif
+
/* Change to unprivileged uid/gid/groups if specified in config file */
if (server_user != NULL)
finish_drop_privileges ();
@@ -1826,6 +1894,18 @@ main_loop_poll (void)
}
#endif
+#ifdef HAVE_NETLINK
+ size_t idx_nl_status_fd = 0;
+ if (nl_status_fd != -1)
+ {
+ idx_nl_status_fd = nused;
+ conns[nused].fd = nl_status_fd;
+ conns[nused].events = POLLRDNORM;
+ ++nused;
+ firstfree = nused;
+ }
+#endif
+
while (1)
{
/* Wait for any event. We wait at most a couple of seconds so
@@ -1968,6 +2048,20 @@ disabled inotify after read error %d"),
}
#endif
+#ifdef HAVE_NETLINK
+ if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0)
+ {
+ char buf[4096];
+ /* Read all the data. We do not interpret it here. */
+ while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
+ sizeof (buf))) != -1)
+ ;
+
+ dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
+ = __bump_nl_timestamp ();
+ }
+#endif
+
for (size_t cnt = first; cnt < nused && n > 0; ++cnt)
if (conns[cnt].revents != 0)
{
@@ -2046,6 +2140,17 @@ main_loop_epoll (int efd)
}
# endif
+# ifdef HAVE_NETLINK
+ if (nl_status_fd != -1)
+ {
+ ev.events = EPOLLRDNORM;
+ ev.data.fd = nl_status_fd;
+ if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1)
+ /* We cannot use epoll. */
+ return;
+ }
+# endif
+
while (1)
{
struct epoll_event revs[100];
@@ -2162,6 +2267,18 @@ main_loop_epoll (int efd)
}
}
# endif
+# ifdef HAVE_NETLINK
+ else if (revs[cnt].data.fd == nl_status_fd)
+ {
+ char buf[4096];
+ /* Read all the data. We do not interpret it here. */
+ while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
+ sizeof (buf))) != -1)
+ ;
+
+ __bump_nl_timestamp ();
+ }
+# endif
else
{
/* Remove the descriptor from the epoll descriptor. */
@@ -2185,6 +2302,7 @@ main_loop_epoll (int efd)
time_t laststart = now - ACCEPT_TIMEOUT;
assert (starttime[sock] == 0);
assert (inotify_fd == -1 || starttime[inotify_fd] == 0);
+ assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0);
for (int cnt = highest; cnt > STDERR_FILENO; --cnt)
if (starttime[cnt] != 0 && starttime[cnt] < laststart)
{
diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
index caad26a..b5cd2d2 100644
--- a/nscd/nscd-client.h
+++ b/nscd/nscd-client.h
@@ -260,12 +260,17 @@ struct hashentry
/* Current persistent database version. */
-#define DB_VERSION 1
+#define DB_VERSION 2
/* Maximum time allowed between updates of the timestamp. */
#define MAPPING_TIMEOUT (5 * 60)
+/* Used indices for the EXTRA_DATA element of 'database_pers_head'.
+ Each database has its own indices. */
+#define NSCD_HST_IDX_CONF_TIMESTAMP 0
+
+
/* Header of persistent database file. */
struct database_pers_head
{
@@ -274,6 +279,8 @@ struct database_pers_head
volatile int32_t gc_cycle;
volatile int32_t nscd_certainly_running;
volatile nscd_time_t timestamp;
+ /* Room for extensions. */
+ volatile uint32_t extra_data[4];
nscd_ssize_t module;
nscd_ssize_t data_size;
@@ -322,6 +329,12 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
request_type type, void *response,
size_t responselen) attribute_hidden;
+/* Try to get a file descriptor for the shared meory segment
+ containing the database. */
+extern struct mapped_database *__nscd_get_mapping (request_type type,
+ const char *key,
+ struct mapped_database **mappedp) attribute_hidden;
+
/* Get reference of mapping. */
extern struct mapped_database *__nscd_get_map_ref (request_type type,
const char *name,
@@ -371,4 +384,7 @@ extern ssize_t writeall (int fd, const void *buf, size_t len)
extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
attribute_hidden;
+/* Get netlink timestamp counter from mapped area or zero. */
+extern uint32_t __nscd_get_nl_timestamp (void);
+
#endif /* nscd.h */
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index 70631fa..6ee142d 100644
--- a/nscd/nscd_gethst_r.c
+++ b/nscd/nscd_gethst_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009
+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -98,6 +98,27 @@ libc_freeres_fn (hst_map_free)
}
+uint32_t
+__nscd_get_nl_timestamp (void)
+{
+ if (__nss_not_use_nscd_hosts != 0)
+ return 0;
+
+ struct mapped_database *map = __hst_map_handle.mapped;
+
+ if (map == NULL
+ || (map != NO_MAPPING
+ && map->head->nscd_certainly_running == 0
+ && map->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
+ map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
+
+ if (map == NO_MAPPING)
+ return 0;
+
+ return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
+}
+
+
int __nss_have_localdomain attribute_hidden;
static int
diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
index fe63f9a..365b599 100644
--- a/nscd/nscd_helper.c
+++ b/nscd/nscd_helper.c
@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped)
/* Try to get a file descriptor for the shared meory segment
containing the database. */
-static struct mapped_database *
-get_mapping (request_type type, const char *key,
- struct mapped_database **mappedp)
+struct mapped_database *
+__nscd_get_mapping (request_type type, const char *key,
+ struct mapped_database **mappedp)
{
struct mapped_database *result = NO_MAPPING;
#ifdef SCM_RIGHTS
@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name,
|| (cur->head->nscd_certainly_running == 0
&& cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
|| cur->head->data_size > cur->datasize)
- cur = get_mapping (type, name,
- (struct mapped_database **) &mapptr->mapped);
+ cur = __nscd_get_mapping (type, name,
+ (struct mapped_database **) &mapptr->mapped);
if (__builtin_expect (cur != NO_MAPPING, 1))
{
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index a5aafe9..216c9cc 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service,
|| (hints->ai_family == PF_INET6 && ! seen_ipv6))
{
/* We cannot possibly return a valid answer. */
- free (in6ai);
+ __free_in6ai (in6ai);
return EAI_NONAME;
}
}
@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service,
{
if (hints->ai_flags & AI_NUMERICSERV)
{
- free (in6ai);
+ __free_in6ai (in6ai);
return EAI_NONAME;
}
@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service,
if (last_i != 0)
{
freeaddrinfo (p);
- free (in6ai);
+ __free_in6ai (in6ai);
return -(last_i & GAIH_EAI);
}
@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service,
}
else
{
- free (in6ai);
+ __free_in6ai (in6ai);
return EAI_FAMILY;
}
@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service,
p->ai_canonname = canonname;
}
- free (in6ai);
+ __free_in6ai (in6ai);
if (p)
{
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index af53f70..3032026 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -161,6 +161,6 @@ CFLAGS-mq_receive.c += -fexceptions
endif
ifeq ($(subdir),nscd)
-sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY
+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
CFLAGS-gai.c += -DNEED_NETLINK
endif
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index d5ad7ea..1f66684 100644
--- a/sysdeps/unix/sysv/linux/check_pf.c
+++ b/sysdeps/unix/sysv/linux/check_pf.c
@@ -1,5 +1,5 @@
/* Determine protocol families for which interfaces exist. Linux version.
- Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006-2008, 2010, 2011 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
@@ -33,6 +33,9 @@
#include <not-cancel.h>
#include <kernel-features.h>
+#include <bits/libc-lock.h>
+#include <atomic.h>
+#include <nscd/nscd-client.h>
#ifndef IFA_F_HOMEADDRESS
@@ -43,9 +46,42 @@
#endif
-static int
-make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
- struct in6addrinfo **in6ai, size_t *in6ailen)
+struct cached_data
+{
+ uint32_t timestamp;
+ uint32_t usecnt;
+ bool seen_ipv4;
+ bool seen_ipv6;
+ size_t in6ailen;
+ struct in6addrinfo in6ai[0];
+};
+
+static struct cached_data noai6ai_cached =
+ {
+ .usecnt = 3, /* Make sure we never try to delete this entry. */
+ .in6ailen = 0
+ };
+
+static struct cached_data *cache;
+__libc_lock_define_initialized (static, lock);
+
+
+#ifdef IS_IN_nscd
+static uint32_t nl_timestamp;
+
+uint32_t
+__bump_nl_timestamp (void)
+{
+ if (atomic_increment_val (&nl_timestamp) == 0)
+ atomic_increment (&nl_timestamp);
+
+ return nl_timestamp;
+}
+#endif
+
+
+static struct cached_data *
+make_request (int fd, pid_t pid)
{
struct req
{
@@ -99,9 +135,6 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
sizeof (nladdr))) < 0)
goto out_fail;
- *seen_ipv4 = false;
- *seen_ipv6 = false;
-
bool done = false;
struct in6ailist
{
@@ -109,6 +142,8 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
struct in6ailist *next;
} *in6ailist = NULL;
size_t in6ailistlen = 0;
+ bool seen_ipv4 = false;
+ bool seen_ipv6 = false;
do
{
@@ -172,12 +207,12 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
{
if (*(const in_addr_t *) address
!= htonl (INADDR_LOOPBACK))
- *seen_ipv4 = true;
+ seen_ipv4 = true;
}
else
{
if (!IN6_IS_ADDR_LOOPBACK (address))
- *seen_ipv6 = true;
+ seen_ipv6 = true;
}
}
@@ -211,30 +246,46 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
}
while (! done);
- if (*seen_ipv6 && in6ailist != NULL)
+ struct cached_data *result;
+ if (seen_ipv6 && in6ailist != NULL)
{
- *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
- if (*in6ai == NULL)
+ result = malloc (sizeof (*result)
+ + in6ailistlen * sizeof (struct in6addrinfo));
+ if (result == NULL)
goto out_fail;
- *in6ailen = in6ailistlen;
+#ifdef IS_IN_nscd
+ result->timestamp = nl_timestamp;
+#else
+ result->timestamp = __nscd_get_nl_timestamp ();
+#endif
+ result->usecnt = 2;
+ result->seen_ipv4 = seen_ipv4;
+ result->seen_ipv6 = true;
+ result->in6ailen = in6ailistlen;
do
{
- (*in6ai)[--in6ailistlen] = in6ailist->info;
+ result->in6ai[--in6ailistlen] = in6ailist->info;
in6ailist = in6ailist->next;
}
while (in6ailist != NULL);
}
+ else
+ {
+ noai6ai_cached.seen_ipv4 = seen_ipv4;
+ noai6ai_cached.seen_ipv6 = seen_ipv6;
+ result = &noai6ai_cached;
+ }
if (use_malloc)
free (buf);
- return 0;
+ return result;
out_fail:
if (use_malloc)
free (buf);
- return -1;
+ return NULL;
}
@@ -258,28 +309,65 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
if (! __no_netlink_support)
{
- int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+ struct cached_data *olddata = NULL;
+ struct cached_data *data = NULL;
+
+ __libc_lock_lock (lock);
- if (__builtin_expect (fd >= 0, 1))
+#ifdef IS_IN_nscd
+# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp
+#else
+# define cache_valid() \
+ ({ uint32_t val = __nscd_get_nl_timestamp (); \
+ val != 0 && cache->timestamp == val; })
+#endif
+ if (cache != NULL && cache_valid ())
+ {
+ data = cache;
+ atomic_increment (&cache->usecnt);
+ }
+ else
{
- struct sockaddr_nl nladdr;
- memset (&nladdr, '\0', sizeof (nladdr));
- nladdr.nl_family = AF_NETLINK;
+ int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+
+ if (__builtin_expect (fd >= 0, 1))
+ {
+ struct sockaddr_nl nladdr;
+ memset (&nladdr, '\0', sizeof (nladdr));
+ nladdr.nl_family = AF_NETLINK;
+
+ socklen_t addr_len = sizeof (nladdr);
+
+ if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
+ && __getsockname (fd, (struct sockaddr *) &nladdr,
+ &addr_len) == 0)
+ data = make_request (fd, nladdr.nl_pid);
+
+ close_not_cancel_no_status (fd);
+ }
+
+ if (data != NULL)
+ {
+ olddata = cache;
+ cache = data;
+ }
+ }
- socklen_t addr_len = sizeof (nladdr);
+ __libc_lock_unlock (lock);
- bool success
- = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
- && __getsockname (fd, (struct sockaddr *) &nladdr,
- &addr_len) == 0
- && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
- in6ai, in6ailen) == 0);
+ if (data != NULL)
+ {
+ /* It worked. */
+ *seen_ipv4 = data->seen_ipv4;
+ *seen_ipv6 = data->seen_ipv6;
+ *in6ailen = data->in6ailen;
+ *in6ai = data->in6ai;
- close_not_cancel_no_status (fd);
+ if (olddata != NULL && olddata->usecnt > 0
+ && atomic_add_zero (&olddata->usecnt, -1))
+ free (olddata);
- if (success)
- /* It worked. */
- return;
+ return;
}
#if __ASSUME_NETLINK_SUPPORT == 0
@@ -318,3 +406,26 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
(void) freeifaddrs (ifa);
#endif
}
+
+
+void
+__free_in6ai (struct in6addrinfo *ai)
+{
+ if (ai != NULL)
+ {
+ struct cached_data *data =
+ (struct cached_data *) ((char *) ai
+ - offsetof (struct cached_data, in6ai));
+
+ if (atomic_add_zero (&data->usecnt, -1))
+ {
+ __libc_lock_lock (lock);
+
+ if (data->usecnt == 0)
+ /* Still unused. */
+ free (data);
+
+ __libc_lock_unlock (lock);
+ }
+ }
+}

23
glibc.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Wed Jan 18 09:29:24 UTC 2012 - aj@suse.de
- Update license strings in spec file.
-------------------------------------------------------------------
Mon Jan 16 13:19:43 UTC 2012 - aj@suse.de
- Split up new subpackage glibc-extra and move makedb with its
dependency on libselinux to it. (bnc#741525)
- Use lua script for verifyscript to not have a dependency on bash
-------------------------------------------------------------------
Thu Jan 12 15:42:36 UTC 2012 - aj@suse.de
- Disable netlink caching (bnc#741021).
-------------------------------------------------------------------
Thu Jan 12 11:01:41 UTC 2012 - aj@suse.de
- Use _target_cpu instead of _build and _host. This makes the
i686 library really build for i686.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 10 12:31:14 UTC 2012 - aj@suse.de Tue Jan 10 12:31:14 UTC 2012 - aj@suse.de

65
glibc.spec
View File

@ -20,7 +20,7 @@
Name: glibc Name: glibc
Summary: Standard Shared Libraries (from the GNU C Library) Summary: Standard Shared Libraries (from the GNU C Library)
License: GPL-2.0+ License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: System/Libraries Group: System/Libraries
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
@ -96,6 +96,7 @@ Source50: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}
Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign
Requires(pre): filesystem Requires(pre): filesystem
Recommends: glibc-extra
Provides: rtld(GNU_HASH) Provides: rtld(GNU_HASH)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %_target_cpu == "i686" %if %_target_cpu == "i686"
@ -196,6 +197,8 @@ Patch89: glibc-2.16-scanf.patch
Patch90: glibc-ppc-getcontext.patch Patch90: glibc-ppc-getcontext.patch
# PATCH-FIX-OPENSUSE Revert some math ifuncs (bnc#740109) - aj@suse.de # PATCH-FIX-OPENSUSE Revert some math ifuncs (bnc#740109) - aj@suse.de
Patch91: glibc-2.15-math64crash.patch Patch91: glibc-2.15-math64crash.patch
# PATCH-FIX-OPENSUSE Remove netlink optimization (bnc#741021) - aj@suse.de
Patch92: glibc-revert-netlink-cache.patch
%description %description
The GNU C Library provides the most important standard libraries used The GNU C Library provides the most important standard libraries used
@ -205,7 +208,7 @@ without these libraries.
%package info %package info
Summary: Info Files for the GNU C Library Summary: Info Files for the GNU C Library
License: GPL-2.0+ License: GFDL-1.1
Group: Documentation/Other Group: Documentation/Other
Requires(post): %{install_info_prereq} Requires(post): %{install_info_prereq}
Requires(postun): %{install_info_prereq} Requires(postun): %{install_info_prereq}
@ -218,7 +221,7 @@ complete and is partially out of date.
%package html %package html
Summary: HTML Documentation for the GNU C Library Summary: HTML Documentation for the GNU C Library
License: GPL-2.0+ ; LGPL-2.1+ License: GFDL-1.1
Group: Documentation/HTML Group: Documentation/HTML
BuildArch: noarch BuildArch: noarch
@ -229,7 +232,7 @@ partially out of date.
%package i18ndata %package i18ndata
Summary: Database Sources for 'locale' Summary: Database Sources for 'locale'
License: LGPL-2.1+ License: GPL-2.0+ and MIT
Group: System/Libraries Group: System/Libraries
BuildArch: noarch BuildArch: noarch
@ -241,7 +244,7 @@ created.
%package locale %package locale
Summary: Locale Data for Localized Programs Summary: Locale Data for Localized Programs
License: GPL-2.0+ ; LGPL-2.1+ License: GPL-2.0+ and MIT and LGPL-2.1+
Group: System/Libraries Group: System/Libraries
Requires(post): /bin/cat Requires(post): /bin/cat
Requires: glibc = %{version} Requires: glibc = %{version}
@ -258,7 +261,7 @@ Locale data for the internationalisation features of the GNU C library.
%package -n nscd %package -n nscd
Summary: Name Service Caching Daemon Summary: Name Service Caching Daemon
License: LGPL-2.1+ License: GPL-2.0+
Group: System/Daemons Group: System/Daemons
Provides: aaa_base:/etc/init.d/nscd Provides: aaa_base:/etc/init.d/nscd
Provides: glibc:/usr/sbin/nscd Provides: glibc:/usr/sbin/nscd
@ -273,7 +276,7 @@ performance with NIS, NIS+, and LDAP.
%package profile %package profile
Summary: Libc Profiling and Debugging Versions Summary: Libc Profiling and Debugging Versions
License: LGPL-2.1+ License: LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: glibc = %{version} Requires: glibc = %{version}
# bug437293 # bug437293
@ -290,7 +293,7 @@ necessary for profiling and debugging.
%package devel %package devel
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ License: BSD-3-Clause and LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Obsoletes: epoll = 1.0 Obsoletes: epoll = 1.0
Provides: epoll < 1.0 Provides: epoll < 1.0
@ -310,7 +313,7 @@ library.
%package devel-static %package devel-static
Summary: C library static libraries for -static linking Summary: C library static libraries for -static linking
License: GPL-2.0+ License: BSD-3-Clause and LGPL-2.1+ and SUSE-LGPL-2.1+-with-GCC-exception and GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
# Provide Fedora name for package to make packaging easier # Provide Fedora name for package to make packaging easier
@ -323,7 +326,7 @@ which is highly discouraged.
%package utils %package utils
Summary: Development utilities from GNU C library Summary: Development utilities from GNU C library
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ License: LGPL-2.1+
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
Requires: glibc = %{version} Requires: glibc = %{version}
@ -334,11 +337,25 @@ debugging.
If you are unsure if you need this, don't install this package. If you are unsure if you need this, don't install this package.
# makedb requires libselinux. We add this program in a separate
# package so that glibc does not require libselinux.
%package extra
Summary: Extra binaries from GNU C Library
License: LGPL-2.1+
Group: Development/Languages/C and C++
Requires: glibc = %{version}
%description extra
The glibc-extra package contains some extra binaries for glibc that
are not essential but recommend to use.
makedb: A program to create a database for nss
%ifarch %ix86 %ifarch %ix86
%package obsolete %package obsolete
Summary: Obsolete Shared Libraries from the GNU C Library Summary: Obsolete Shared Libraries from the GNU C Library
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ License: LGPL-2.0+
Group: System/Libraries Group: System/Libraries
Requires: glibc = %{version} Requires: glibc = %{version}
@ -415,6 +432,7 @@ rm nscd/s-stamp
%patch89 -p1 %patch89 -p1
%patch90 -p1 %patch90 -p1
%patch91 -p1 %patch91 -p1
%patch92 -p1 -R
# #
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@ -451,6 +469,10 @@ fi
uptime || : uptime || :
ulimit -a ulimit -a
nice nice
# We do not want configure to figure out the system its building one
# to support a common ground and thus set build and host to the
# target_cpu.
%define target %{_target_cpu}-suse-linux
# Adjust glibc version.h # Adjust glibc version.h
echo "#define CONFHOST \"%{_target_cpu}-suse-linux\"" >> version.h echo "#define CONFHOST \"%{_target_cpu}-suse-linux\"" >> version.h
echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h
@ -540,7 +562,7 @@ configure_and_build_glibc() {
%if %{enable_stackguard_randomization} %if %{enable_stackguard_randomization}
--enable-stackguard-randomization \ --enable-stackguard-randomization \
%endif %endif
--build=%{_build} --host=%{_host} \ --build=%{target} --host=%{target} \
%ifarch ppc ppc64 %{ix86} x86_64 %ifarch ppc ppc64 %{ix86} x86_64
--enable-multi-arch \ --enable-multi-arch \
%endif %endif
@ -857,6 +879,15 @@ install -m 644 %{SOURCE22} %{buildroot}/lib/systemd/system
%post -p %{_sbindir}/glibc_post_upgrade %post -p %{_sbindir}/glibc_post_upgrade
# Enabling the following lines will generate a
# requires on /bin/sh but glibc should not require any other binary
# packages. Therefore we do the change with the build-in lua:
# %verifyscript
# %verify_permissions -e %{_libdir}/pt_chown
%verifyscript -p <lua>
os.execute("/usr/bin/chkstat -n --warn --system -e %{_libdir}/pt_chown")
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%post locale %post locale
@ -885,9 +916,6 @@ mkdir -p /var/run/nscd
%insserv_cleanup %insserv_cleanup
exit 0 exit 0
%verifyscript
%verify_permissions -e %{_libdir}/pt_chown
####################################################################### #######################################################################
### ###
### FILES ### FILES
@ -1020,14 +1048,12 @@ exit 0
%endif %endif
%{_bindir}/locale %{_bindir}/locale
%{_bindir}/localedef %{_bindir}/localedef
%{_bindir}/makedb
%verify(not mode caps) %attr(4755,root,root) %{_libdir}/pt_chown %verify(not mode caps) %attr(4755,root,root) %{_libdir}/pt_chown
%dir %attr(0755,root,root) %{_libdir}/getconf %dir %attr(0755,root,root) %{_libdir}/getconf
%{_libdir}/getconf/* %{_libdir}/getconf/*
%{_sbindir}/glibc_post_upgrade %{_sbindir}/glibc_post_upgrade
%{_sbindir}/iconvconfig %{_sbindir}/iconvconfig
%dir /var/db %dir /var/db
/var/db/Makefile
%ifarch %ix86 %ifarch %ix86
@ -1148,4 +1174,9 @@ exit 0
%{_bindir}/xtrace %{_bindir}/xtrace
%{_bindir}/pldd %{_bindir}/pldd
%files extra
%defattr(-,root,root)
%{_bindir}/makedb
/var/db/Makefile
%changelog %changelog