Merge the 2021-03-05 SPL branch from AOSP-Partner
* security-aosp-pi-release:
Fix UAF problem in wificond
Change-Id: I1feaf37025eba1f17b306d24eca727f8e0d739e2
diff --git a/main.cpp b/main.cpp
index 9928f63..b049a3d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -142,13 +142,13 @@
android::wificond::NetlinkUtils netlink_utils(&netlink_manager);
android::wificond::ScanUtils scan_utils(&netlink_manager);
- unique_ptr<android::wificond::Server> server(new android::wificond::Server(
+ android::sp<android::wificond::Server> server(new android::wificond::Server(
unique_ptr<InterfaceTool>(new InterfaceTool),
unique_ptr<SupplicantManager>(new SupplicantManager()),
unique_ptr<HostapdManager>(new HostapdManager()),
&netlink_utils,
&scan_utils));
- RegisterServiceOrCrash(server.get());
+ RegisterServiceOrCrash(server);
event_dispatcher->Poll();
LOG(INFO) << "wificond is about to exit";