GNU C Library master sources branch, master, updated. glibc-2.13-30-g6c8a2e8

[roland 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  6c8a2e88d12b7341440ac9669db0448223deb381 (commit)
      from  071f805ea30da4f4c43f45ceb8f4ad6aacffa51e (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6c8a2e88d12b7341440ac9669db0448223deb381

commit 6c8a2e88d12b7341440ac9669db0448223deb381
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Mon Feb 21 16:53:10 2011 -0800

    Fix __if_freereq crash: Unlike the generic version which uses free, Hurd needs munmap.

diff --git a/ChangeLog b/ChangeLog
index 7d05dbe..0113c4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-22  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+        Fix __if_freereq crash: Unlike the generic version which uses free,
+	Hurd needs munmap.
+	* sysdeps/mach/hurd/ifreq.h: New file.
+
 2011-01-27  Petr Baudis  <pasky@suse.cz>
 	    Ulrich Drepper  <drepper@gmail.com>
 
diff --git a/sysdeps/mach/hurd/ifreq.h b/sysdeps/mach/hurd/ifreq.h
new file mode 100644
index 0000000..92cb7b9
--- /dev/null
+++ b/sysdeps/mach/hurd/ifreq.h
@@ -0,0 +1,45 @@
+/* Copyright (C) 1999, 2002, 2003, 2011 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Andreas Jaeger <aj@suse.de>.
+
+   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, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <net/if.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
+
+static inline struct ifreq *
+__if_nextreq (struct ifreq *ifr)
+{
+#ifdef _HAVE_SA_LEN
+  if (ifr->ifr_addr.sa_len > sizeof ifr->ifr_addr)
+    return (struct ifreq *) ((char *) &ifr->ifr_addr + ifr->ifr_addr.sa_len);
+#endif
+  return ifr + 1;
+}
+
+extern void __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd);
+
+
+static inline void
+__if_freereq (struct ifreq *ifreqs, int num_ifs)
+{
+  munmap (ifreqs, num_ifs * sizeof (struct ifreq));
+}

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

Summary of changes:
 ChangeLog                              |    6 ++++++
 sysdeps/{generic => mach/hurd}/ifreq.h |    5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 copy sysdeps/{generic => mach/hurd}/ifreq.h (90%)


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