am de806dfd: Fix DoS vulnerability in DHO_OPTIONSOVERLOADED.
* commit 'de806dfdb6dd3b9dec5d1d23c9029fb300799cf8':
Fix DoS vulnerability in DHO_OPTIONSOVERLOADED.
diff --git a/Android.mk b/Android.mk
index 6b55f0d..4170e16 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,8 @@
if-linux.c if-linux-wireless.c lpf.c \
platform-linux.c compat/closefrom.c ifaddrs.c ipv6rs.c
+# Clang complains about configure.c's comparing array with null.
+LOCAL_CFLAGS += -Wno-tautological-pointer-compare
LOCAL_SHARED_LIBRARIES := libc libcutils libnetutils
LOCAL_MODULE = dhcpcd
include $(BUILD_EXECUTABLE)
diff --git a/if-linux.c b/if-linux.c
index 9355359..3d0bcad 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -40,13 +40,6 @@
# define IFLA_WIRELESS (IFLA_MASTER + 1)
#endif
-/* For some reason, glibc doesn't include newer flags from linux/if.h
- * However, we cannot include linux/if.h directly as it conflicts
- * with the glibc version. D'oh! */
-#ifndef IFF_LOWER_UP
-#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
-#endif
-
#include <errno.h>
#include <ctype.h>
#include <stddef.h>
@@ -61,6 +54,15 @@
#include "dhcp.h"
#include "net.h"
+/* ANDROID change, moved this below all includes. */
+/* For some reason, glibc doesn't include newer flags from linux/if.h
+ * However, we cannot include linux/if.h directly as it conflicts
+ * with the glibc version. D'oh! */
+#ifndef IFF_LOWER_UP
+#define IFF_LOWER_UP 0x10000 /* driver signals L1 up */
+#endif
+/* End of ANDROID change */
+
static int sock_fd;
static struct sockaddr_nl sock_nl;
