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.

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

Enable ext ql #287

Merged
merged 4 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 28 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
path: vm-manager

- run: |
export CC=/usr/bin/clang
export CXX=/usr/bin/clang++
mkdir vm-manager/build/
cd vm-manager/build/
mkdir build/
cd build/
cmake -DCMAKE_BUILD_TYPE=Release ..
cmake --build . --config Release
cd -
Expand All @@ -40,12 +38,36 @@ jobs:
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
#queries: security-extended,security-and-quality
queries: security-extended,security-and-quality

- run: |
cd vm-manager/build/
cd build/
find src/CMakeFiles/vm-manager.dir/ -iname *.o |xargs rm
cmake --build . --config Release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
upload: False
output: sarif-results

- name: Filter SARIF
uses: advanced-security/filter-sarif@v1
with:
patterns: |
-build/**:**
-src/services/protos/gens/**:**
input: sarif-results/cpp.sarif
output: sarif-results/cpp-filtered.sarif

- name: Upload SARIF
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: sarif-results/cpp-filtered.sarif

- name: artifacts
uses: actions/upload-artifact@v3
with:
name: sarif-results
path: sarif-results

1 change: 1 addition & 0 deletions src/guest/vm_builder.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ static inline constexpr const char *VmStateToStr(VmBuilder::VmState s) {
case VmBuilder::kVmPaused: return "Paused";
case VmBuilder::kVmUnknown: return "Unknown";
}
return "NaN";
}


Expand Down
2 changes: 1 addition & 1 deletion src/guest/vm_builder_qemu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@ static bool SetupHugePages(const std::string &mem_size) {
WriteSysFile(kSys2MNrHugePages, std::to_string(required_hp));

/* check nr huge pages */
int wait_cnt = 0;
while (nr_hp != required_hp) {
int wait_cnt = 0;
nr_hp = ReadSysFile(kSys2MNrHugePages, std::ios_base::dec);
if (wait_cnt < 200) {
usleep(10000);
Expand Down
6 changes: 3 additions & 3 deletions src/guest/vm_process.cc
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ bool VmProcSimple::Running(void) {
}

VmProcSimple::~VmProcSimple() {
Stop();
VmProcSimple::Stop();
}


Expand Down Expand Up @@ -164,7 +164,7 @@ void VmCoProcRpmb::Stop(void) {


VmCoProcRpmb::~VmCoProcRpmb() {
Stop();
VmCoProcRpmb::Stop();
}

void VmCoProcVtpm::Run(void) {
Expand All @@ -186,7 +186,7 @@ void VmCoProcVtpm::Stop(void) {
}

VmCoProcVtpm::~VmCoProcVtpm() {
Stop();
VmCoProcVtpm::Stop();
}

} // namespace vm_manager