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

This commit is contained in:
Samuel Thibault 2011-02-21 16:53:10 -08:00 committed by Roland McGrath
parent 071f805ea3
commit 6c8a2e88d1
2 changed files with 51 additions and 0 deletions

View File

@ -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>

45
sysdeps/mach/hurd/ifreq.h Normal file
View File

@ -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));
}