Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some build failures that happen on Ubuntu 24.04 #854

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix some build failures that happen on Ubuntu 24.04 #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/DBusParse
Open in desktop
Submodule DBusParse updated 29 files
+1 −1 .gitignore
+1 −1 CMakeLists.txt
+1 −1 README.md
+1 −1 include/CMakeLists.txt
+422 −544 include/DBusParse/dbus.hpp
+1 −2 include/DBusParse/dbus_auth.hpp
+5 −7 include/DBusParse/dbus_print.hpp
+7 −13 include/DBusParse/dbus_random.hpp
+35 −43 include/DBusParse/dbus_serialize.hpp
+35 −65 include/DBusParse/dbus_utils.hpp
+2 −6 include/DBusParseUtils/endianness.hpp
+9 −11 include/DBusParseUtils/error.hpp
+68 −104 include/DBusParseUtils/parse.hpp
+10 −16 include/DBusParseUtils/utils.hpp
+1 −1 src/CMakeLists.txt
+1 −1 src/DBusParse/CMakeLists.txt
+84 −131 src/DBusParse/dbus.cpp
+8 −9 src/DBusParse/dbus_auth.cpp
+452 −785 src/DBusParse/dbus_parse.cpp
+102 −94 src/DBusParse/dbus_print.cpp
+99 −95 src/DBusParse/dbus_random.cpp
+8 −15 src/DBusParse/dbus_serialize.cpp
+106 −237 src/DBusParse/dbus_utils.cpp
+1 −1 src/DBusParseUtils/CMakeLists.txt
+22 −37 src/DBusParseUtils/parse.cpp
+8 −11 src/DBusParseUtils/utils.cpp
+1 −1 tests/CMakeLists.txt
+1 −1 tests/DBusParseUnitTests/CMakeLists.txt
+21 −36 tests/DBusParseUnitTests/dbus_unit_tests.cpp
2 changes: 1 addition & 1 deletion SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/EPollLoop
Open in desktop
Submodule EPollLoop updated 7 files
+1 −1 .gitignore
+1 −1 CMakeLists.txt
+1 −1 include/CMakeLists.txt
+50 −61 include/EPollLoop/EPollLoop.hpp
+1 −1 src/CMakeLists.txt
+1 −1 src/EPollLoop/CMakeLists.txt
+50 −82 src/EPollLoop/EPollLoop.cpp
2 changes: 1 addition & 1 deletion SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/EPollLoopDBusHandler
Open in desktop
Submodule EPollLoopDBusHandler updated 7 files
+1 −1 .gitignore
+1 −1 CMakeLists.txt
+1 −1 include/CMakeLists.txt
+42 −60 include/EPollLoopDBusHandler/EPollLoopDBusHandler.hpp
+1 −1 src/CMakeLists.txt
+1 −1 src/EPollLoopDBusHandler/CMakeLists.txt
+95 −161 src/EPollLoopDBusHandler/EPollLoopDBusHandler.cpp
2 changes: 1 addition & 1 deletion SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/poc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down
8 changes: 4 additions & 4 deletions SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/poc2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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;
}
);
Expand Down Expand Up @@ -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"));
}
Expand Down
14 changes: 7 additions & 7 deletions SecurityExploits/Ubuntu/accountsservice_CVE-2021-3939/poc3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -611,7 +611,7 @@ class AccountsHandler : public AccountsHandlerBase {
fflush(stderr);
}

int attempt_exploit() {
int attempt_exploit() override {
choose_batch_size();

return findUserByID(
Expand All @@ -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;
}
);
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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"));
}
Expand Down
2 changes: 1 addition & 1 deletion SecurityExploits/polkit/authentication_bypass_CVE-2021-3560/DBusParse
Open in desktop
Submodule DBusParse updated 29 files
+1 −1 .gitignore
+1 −1 CMakeLists.txt
+1 −1 README.md
+1 −1 include/CMakeLists.txt
+424 −539 include/DBusParse/dbus.hpp
+1 −2 include/DBusParse/dbus_auth.hpp
+5 −7 include/DBusParse/dbus_print.hpp
+7 −13 include/DBusParse/dbus_random.hpp
+35 −43 include/DBusParse/dbus_serialize.hpp
+41 −38 include/DBusParse/dbus_utils.hpp
+2 −6 include/DBusParseUtils/endianness.hpp
+9 −11 include/DBusParseUtils/error.hpp
+73 −100 include/DBusParseUtils/parse.hpp
+20 −14 include/DBusParseUtils/utils.hpp
+1 −1 src/CMakeLists.txt
+1 −1 src/DBusParse/CMakeLists.txt
+84 −131 src/DBusParse/dbus.cpp
+8 −9 src/DBusParse/dbus_auth.cpp
+452 −785 src/DBusParse/dbus_parse.cpp
+103 −95 src/DBusParse/dbus_print.cpp
+99 −95 src/DBusParse/dbus_random.cpp
+8 −15 src/DBusParse/dbus_serialize.cpp
+140 −249 src/DBusParse/dbus_utils.cpp
+1 −1 src/DBusParseUtils/CMakeLists.txt
+22 −37 src/DBusParseUtils/parse.cpp
+8 −11 src/DBusParseUtils/utils.cpp
+1 −1 tests/CMakeLists.txt
+1 −1 tests/DBusParseUnitTests/CMakeLists.txt
+21 −36 tests/DBusParseUnitTests/dbus_unit_tests.cpp
2 changes: 1 addition & 1 deletion SecurityExploits/polkit/file_descriptor_exhaustion_CVE-2021-4115/DBusParse
Open in desktop
Submodule DBusParse updated 29 files
+1 −1 .gitignore
+1 −1 CMakeLists.txt
+1 −1 README.md
+1 −1 include/CMakeLists.txt
+422 −544 include/DBusParse/dbus.hpp
+1 −2 include/DBusParse/dbus_auth.hpp
+5 −7 include/DBusParse/dbus_print.hpp
+7 −13 include/DBusParse/dbus_random.hpp
+35 −43 include/DBusParse/dbus_serialize.hpp
+35 −65 include/DBusParse/dbus_utils.hpp
+2 −6 include/DBusParseUtils/endianness.hpp
+9 −11 include/DBusParseUtils/error.hpp
+68 −104 include/DBusParseUtils/parse.hpp
+10 −16 include/DBusParseUtils/utils.hpp
+1 −1 src/CMakeLists.txt
+1 −1 src/DBusParse/CMakeLists.txt
+84 −131 src/DBusParse/dbus.cpp
+8 −9 src/DBusParse/dbus_auth.cpp
+452 −785 src/DBusParse/dbus_parse.cpp
+102 −94 src/DBusParse/dbus_print.cpp
+99 −95 src/DBusParse/dbus_random.cpp
+8 −15 src/DBusParse/dbus_serialize.cpp
+106 −237 src/DBusParse/dbus_utils.cpp
+1 −1 src/DBusParseUtils/CMakeLists.txt
+22 −37 src/DBusParseUtils/parse.cpp
+8 −11 src/DBusParseUtils/utils.cpp
+1 −1 tests/CMakeLists.txt
+1 −1 tests/DBusParseUnitTests/CMakeLists.txt
+21 −36 tests/DBusParseUnitTests/dbus_unit_tests.cpp