Really disable IPv6 RA processing in dhcpcd.
IPv6 RA processing in dhcpcd causes crashes, so we disabled it in
dhcpcd.conf. Unfortunately devices sometimes don't have the
config file, because one is not required for dhcpcd to work. So
disable IPv6 RA processing in the code too.
(cherry picked from commit 69eb1982f233676775ccb8718fc62e78c137e33d)
Bug: 15268738
Bug: 15779617
Change-Id: I1f8627b9e03abd6487bf6a290feb0578166eb4f0
diff --git a/if-options.c b/if-options.c
index 3f52bfe..4fbdf13 100644
--- a/if-options.c
+++ b/if-options.c
@@ -796,7 +796,13 @@
ifo = xzalloc(sizeof(*ifo));
ifo->options |= DHCPCD_GATEWAY | DHCPCD_DAEMONISE | DHCPCD_LINK;
ifo->options |= DHCPCD_ARP | DHCPCD_IPV4LL;
+#ifndef ANDROID
+ /* On Android, don't enable IPv6 RS processing. This is because we
+ * already process RAs in the kernel and netd and because we've seen
+ * dhcpcd crashes when parsing certain RA options.
+ * See http://b/15268738 and http://b/15779617 . */
ifo->options |= DHCPCD_IPV6RS | DHCPCD_IPV6RA_REQRDNSS;
+#endif
ifo->timeout = DEFAULT_TIMEOUT;
ifo->reboot = DEFAULT_REBOOT;
ifo->metric = -1;
