Do not abort on failure to parse hex IPv6 from /proc/net/if_inet6

Author: orivej

opal/mca/if/linux_ipv6/if_linux_ipv6.c

@@ -52,6 +52,8 @@
 #include "opal/mca/if/if.h"
 #include "opal/mca/if/base/base.h"
 
+#define LOG_PREFIX "mca: if: linux_ipv6: "
+
 static int if_linux_ipv6_open(void);
 
 /* Discovers Linux IPv6 interfaces */
@@ -77,19 +79,32 @@ opal_if_base_component_t mca_if_linux_ipv6_component = {
     },
 };
 
-static int hex2int(char hex)
+static bool hex2int(char hex, int *dst)
 {
-    if ('0' <= hex && hex <= '9') return hex - '0';
-    if ('A' <= hex && hex <= 'F') return hex - 'A' + 10;
-    if ('a' <= hex && hex <= 'f') return hex - 'a' + 10;
-    abort();
+    if ('0' <= hex && hex <= '9') {
+        *dst = hex - '0';
+    } else if ('A' <= hex && hex <= 'F') {
+        *dst = hex - 'A' + 10;
+    } else if ('a' <= hex && hex <= 'f') {
+        *dst = hex - 'a' + 10;
+    } else {
+        return false;
+    }
+    return true;
+
 }
 
-static void hexdecode(const char *src, char *dst, size_t dstsize)
+static bool hexdecode(const char *src, char *dst, size_t dstsize)
 {
+    int hi, lo;
     for (size_t i = 0; i < dstsize; i++) {
-        dst[i] = hex2int(src[i * 2]) * 16 + hex2int(src[i * 2 + 1]);
+        if (hex2int(src[i * 2], &hi) && hex2int(src[i * 2 + 1], &lo)) {
+            dst[i] = 16 * hi + lo;
+        } else {
+            return false;
+        }
     }
+    return true;
 }
 
 static int if_linux_ipv6_open(void)
@@ -108,24 +123,28 @@ static int if_linux_ipv6_open(void)
                       &idx, &pfxlen, &scope, &dadstat, ifname) != EOF) {
             opal_if_t *intf;
 
-            hexdecode(addrhex, a6.s6_addr, sizeof a6.s6_addr);
+            if (!hexdecode(addrhex, a6.s6_addr, sizeof a6.s6_addr)) {
+                opal_output(0, LOG_PREFIX "skipped interface %s: failed to hexdecode %s\n",
+                            ifname, addrhex);
+                continue;
+            };
             inet_ntop(AF_INET6, a6.s6_addr, addrstr, sizeof addrstr);
 
             opal_output_verbose(1, opal_if_base_framework.framework_output,
-                                "found interface %s inet6 %s scope %x\n",
+                                LOG_PREFIX "found interface %s inet6 %s scope %x\n",
                                 ifname, addrstr, scope);
 
             /* Only interested in global (0x00) scope */
             if (scope != 0x00)  {
                 opal_output_verbose(1, opal_if_base_framework.framework_output,
-                                    "skipped interface %s inet6 %s scope %x\n",
+                                    LOG_PREFIX "skipped interface %s inet6 %s scope %x\n",
                                     ifname, addrstr, scope);
                 continue;
             }
 
             intf = OBJ_NEW(opal_if_t);
             if (NULL == intf) {
-                opal_output(0, "opal_ifinit: unable to allocate %lu bytes\n",
+                opal_output(0, LOG_PREFIX "unable to allocate %lu bytes\n",
                             (unsigned long)sizeof(opal_if_t));
                 fclose(f);
                 return OPAL_ERR_OUT_OF_RESOURCE;
@@ -150,7 +169,7 @@ static int if_linux_ipv6_open(void)
                to list */
             opal_list_append(&opal_if_list, &(intf->super));
             opal_output_verbose(1, opal_if_base_framework.framework_output,
-                                "added interface %s inet6 %s scope %x\n",
+                                LOG_PREFIX "added interface %s inet6 %s scope %x\n",
                                 ifname, addrstr, scope);
         } /* of while */
         fclose(f);