aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2010-10-11 09:38:00 -0400
committerUlrich Drepper <drepper@gmail.com>2010-10-11 09:38:00 -0400
commit1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8 (patch)
treec335539bce3bce8bfb30274a4d820595b98e0bb1
parent9ff8d36f27aaf390fd074976cd2e867ba41f2588 (diff)
downloadglibc-1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8.tar
glibc-1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8.tar.gz
glibc-1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8.tar.bz2
glibc-1751705d1c4e8b7aba391391d1d8d88fe8c9d8b8.zip
Linux getifaddrs might return entries with ->ifa_addr being NULL.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--sysdeps/unix/sysv/linux/check_pf.c13
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 8255ce0097..8515aa1b99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-11 Ulrich Drepper <drepper@gmail.com>
+
+ [BZ #12093]
+ * sysdeps/unix/sysv/linux/check_pf.c (__check_pf): ->ifa_addr might
+ be NULL.
+
2010-10-07 Jakub Jelinek <jakub@redhat.com>
[BZ #3268]
diff --git a/NEWS b/NEWS
index f8482c4172..832dd20758 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.13
* The following bugs are resolved with this release:
3268, 7066, 10851, 11611, 11640, 11701, 11840, 11856, 11883, 11903, 11904,
- 11968, 11979, 12005, 12037, 12067, 12077, 12092, 12107
+ 11968, 11979, 12005, 12037, 12067, 12077, 12092, 12093, 12107
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
index e694342998..b789a32eab 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 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2007, 2008, 2010 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
@@ -304,10 +304,13 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
struct ifaddrs *runp;
for (runp = ifa; runp != NULL; runp = runp->ifa_next)
- if (runp->ifa_addr->sa_family == PF_INET)
- *seen_ipv4 = true;
- else if (runp->ifa_addr->sa_family == PF_INET6)
- *seen_ipv6 = true;
+ if (runp->ifa_addr != NULL)
+ {
+ if (runp->ifa_addr->sa_family == PF_INET)
+ *seen_ipv4 = true;
+ else if (runp->ifa_addr->sa_family == PF_INET6)
+ *seen_ipv6 = true;
+ }
(void) freeifaddrs (ifa);
#endif