Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Fix UAF problem in wificond
Change-Id: I39b338b8f60c8661e03c7be40959c3fb8588d1ec
diff --git a/main.cpp b/main.cpp
index 4e8586f..43c592d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -140,11 +140,11 @@
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),
&netlink_utils,
&scan_utils));
- RegisterServiceOrCrash(server.get());
+ RegisterServiceOrCrash(server);
event_dispatcher->Poll();
LOG(INFO) << "wificond is about to exit";