Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3
* dev/11/fp3/security-aosp-rvc-release:
Fix Heap-use-after-free in MDnsSdListener::Monitor::run
Change-Id: Ibdf9e58199410637bd19233398cf664da39f3b1a
diff --git a/server/NetlinkHandler.cpp b/server/NetlinkHandler.cpp
index 7fb3437..cd5b0d5 100644
--- a/server/NetlinkHandler.cpp
+++ b/server/NetlinkHandler.cpp
@@ -125,7 +125,16 @@
notifyInterfaceRemoved(iface);
} else if (action == NetlinkEvent::Action::kChange) {
evt->dump();
- notifyInterfaceChanged("nana", true);
+ const char *alertName = evt->findParam("ALERT_NAME");
+ const char *iface = evt->findParam("INTERFACE");
+ if (alertName != NULL && iface != NULL) {
+ ALOGI("Alertname : %s iface (%s)", alertName, iface);
+ if (!strcmp(alertName, "quotaReachedAlert") && iface) {
+ notifyQuotaLimitReached(alertName, iface);
+ }
+ } else {
+ notifyInterfaceChanged("nana", true);
+ }
} else if (action == NetlinkEvent::Action::kLinkUp) {
notifyInterfaceLinkChanged(iface, true);
} else if (action == NetlinkEvent::Action::kLinkDown) {
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index 2445fb7..7567dd5 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -263,6 +263,7 @@
"/system/bin/dnsmasq",
"--keep-in-foreground",
"--no-resolv",
+ "--dhcp-ignore-names",
"--no-poll",
"--dhcp-authoritative",
// TODO: pipe through metered status from ConnService