Merge branch 'busybox' into merge

8 files changed, 17 insertions, 9 deletions

diff --git a/networking/ifplugd.c b/networking/ifplugd.c
index 9bc1a075f..5059eaf73 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -367,7 +367,7 @@ static void up_iface(void)
                 /* Let user know we mess up with interface */
                 bb_error_msg("upping interface");
                 if (network_ioctl(SIOCSIFFLAGS, &ifrequest, "setting interface flags") < 0) {
-                        if (errno != ENODEV)
+                        if (errno != ENODEV && errno != EADDRNOTAVAIL)
                                 xfunc_die();
                         G.iface_exists = 0;
                         return;
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 534c9f0c7..5481134e5 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -138,6 +138,7 @@
 //usage:     "\n        -v      Print out what would happen before doing it"
 //usage:     "\n        -f      Force deconfiguration"
 
+#include <net/if.h>
 #include "libbb.h"
 #include "common_bufsiz.h"
 /* After libbb.h, since it needs sys/types.h on some systems */
@@ -503,6 +504,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
 
 static int FAST_FUNC static_down6(struct interface_defn_t *ifd, execfn *exec)
 {
+        if (!if_nametoindex(ifd->iface))
+                return 1; /* already gone */
 # if ENABLE_FEATURE_IFUPDOWN_IP
         return execute("ip link set %iface% down", ifd, exec);
 # else
@@ -598,6 +601,9 @@ static int FAST_FUNC static_up(struct interface_defn_t *ifd, execfn *exec)
 static int FAST_FUNC static_down(struct interface_defn_t *ifd, execfn *exec)
 {
         int result;
+
+        if (!if_nametoindex(ifd->iface))
+                return 2; /* already gone */
 # if ENABLE_FEATURE_IFUPDOWN_IP
         /* Optional "label LBL" is necessary if interface is an alias (eth0:0),
          * otherwise "ip addr flush dev eth0:0" flushes all addresses on eth0.
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 2aa8b683b..9c164a71d 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -161,7 +161,7 @@ static int get_address(char *dev, int *htype)
 
         s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
 
-        memset(&ifr, 0, sizeof(ifr));
+        /*memset(&ifr, 0, sizeof(ifr)); - SIOCGIFINDEX does not need to clear all */
         strncpy_IFNAMSIZ(ifr.ifr_name, dev);
         xioctl(s, SIOCGIFINDEX, &ifr);
 
diff --git a/networking/netstat.c b/networking/netstat.c
index 33281e333..f6bcd44ba 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -397,8 +397,11 @@ static char *ip_port_str(struct sockaddr *addr, int port, const char *proto, int
         /* Code which used "*" for INADDR_ANY is removed: it's ambiguous
          * in IPv6, while "0.0.0.0" is not. */
 
-        host = numeric ? xmalloc_sockaddr2dotted_noport(addr)
-                       : xmalloc_sockaddr2host_noport(addr);
+        host = NULL;
+        if (!numeric)
+                host = xmalloc_sockaddr2host_noport(addr);
+        if (!host)
+                host = xmalloc_sockaddr2dotted_noport(addr);
 
         host_port = xasprintf("%s:%s", host, get_sname(htons(port), proto, numeric));
         free(host);
diff --git a/networking/route.c b/networking/route.c
index 6edc0f6d7..8387ce1bb 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -444,7 +444,7 @@ static NOINLINE void INET6_setroute(int action, char **args)
 
         if (devname) {
                 struct ifreq ifr;
-                memset(&ifr, 0, sizeof(ifr));
+                /*memset(&ifr, 0, sizeof(ifr)); - SIOCGIFINDEX does not need to clear all */
                 strncpy_IFNAMSIZ(ifr.ifr_name, devname);
                 xioctl(skfd, SIOCGIFINDEX, &ifr);
                 rt.rtmsg_ifindex = ifr.ifr_ifindex;
diff --git a/networking/ssl_client.c b/networking/ssl_client.c
index e56d82fc1..49aec6b99 100644
--- a/networking/ssl_client.c
+++ b/networking/ssl_client.c
@@ -41,7 +41,6 @@ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
         tls = new_tls_state();
 #if !ENABLE_PLATFORM_MINGW32
         opt = getopt32(argv, "es:+r:+n:", &tls->ofd, &tls->ifd, &sni);
-
         if (!(opt & (1<<2))) {
                 /* -r N defaults to -s N */
                 tls->ifd = tls->ofd;
diff --git a/networking/udhcp/d6_socket.c b/networking/udhcp/d6_socket.c
index 315c8d98a..6ad53a9c2 100644
--- a/networking/udhcp/d6_socket.c
+++ b/networking/udhcp/d6_socket.c
@@ -63,7 +63,7 @@ int FAST_FUNC d6_read_interface(const char *interface, int *ifindex, struct in6_
                 struct ifreq ifr;
                 int fd;
 
-                memset(&ifr, 0, sizeof(ifr));
+                /*memset(&ifr, 0, sizeof(ifr)); - SIOCGIFINDEX does not need to clear all */
                 strncpy_IFNAMSIZ(ifr.ifr_name, interface);
                 fd = xsocket(AF_INET6, SOCK_RAW, IPPROTO_RAW);
                 if (ioctl(fd, SIOCGIFINDEX, &ifr) == 0) {
diff --git a/networking/wget.c b/networking/wget.c
index 194bf457a..aaa068ba9 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -409,7 +409,7 @@ static FILE *open_socket(len_and_sockaddr *lsa)
         /* hopefully it understands what ESPIPE means... */
         fp = fdopen(fd, "r+");
         if (!fp)
-                bb_perror_msg_and_die(bb_msg_memory_exhausted);
+                bb_die_memory_exhausted();
 
         return fp;
 }
@@ -1146,7 +1146,7 @@ static void download_one_url(const char *url)
 # endif
                         sfp = fdopen(fd, "r+");
                         if (!sfp)
-                                bb_perror_msg_and_die(bb_msg_memory_exhausted);
+                                bb_die_memory_exhausted();
                         goto socket_opened;
                 }
                 sfp = open_socket(lsa);