Attachment 1452839 Details for Bug 1587880 – untested more complete workaround

[patch] untested more complete workaround

retry.patch (text/plain), 1.26 KB, created by Jiri Benc on 2018-06-19 08:22:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Benc

Created: 2018-06-19 08:22:44 UTC

Size: 1.26 KB

patch

obsolete

>diff --git a/lib/netdev.c b/lib/netdev.c
>index 83614f560e8f..489eeaca82ba 100644
>--- a/lib/netdev.c
>+++ b/lib/netdev.c
>@@ -2039,20 +2039,31 @@ netdev_get_addrs(const char dev[], struct in6_addr **paddr,
>     struct in6_addr *addr_array, *mask_array;
>     const struct ifaddrs *ifa;
>     int cnt = 0, i = 0;
>+    int retries = 3;
> 
>     ovs_mutex_lock(&if_addr_list_lock);
>     if (!if_addr_list) {
>         int err;
> 
>+retry:
>         err = getifaddrs(&if_addr_list);
>         if (err) {
>             ovs_mutex_unlock(&if_addr_list_lock);
>             return -err;
>         }
>+        retries--;
>     }
> 
>     for (ifa = if_addr_list; ifa; ifa = ifa->ifa_next) {
>-        if (ifa->ifa_addr && ifa->ifa_name && ifa->ifa_netmask) {
>+        if (!ifa->ifa_name && retries) {
>+            /* Older versions of glibc have a bug on race condition with
>+             * address addition which may cause one of the returned ifa_name
>+             * values to be NULL. In such case, we know that we've got an
>+             * inconsistent dump. Retry but beware of an endless loop. */
>+            freeifaddrs(if_addr_list);
>+            goto retry;
>+        }
>+        if (ifa->ifa_name && ifa->ifa_addr && ifa->ifa_netmask) {
>             int family;
> 
>             family = ifa->ifa_addr->sa_family;

Actions: View | Diff

Attachments on bug 1587880: 1452839