Report swapinfo#140
Open
ben-grande wants to merge 1 commit into
Open
Conversation
Allows distinguishing how much memory the qube is using from what is assigned by using "meminfo - swapinfo". For: QubesOS/qubes-core-admin#827
ben-grande
added a commit
to ben-grande/qubes-core-admin
that referenced
this pull request
Jun 25, 2026
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #140 +/- ##
=======================================
Coverage 71.24% 71.24%
=======================================
Files 6 6
Lines 991 991
=======================================
Hits 706 706
Misses 285 285 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
ben-grande
added a commit
to ben-grande/qubes-core-admin
that referenced
this pull request
Jun 25, 2026
ben-grande
added a commit
to ben-grande/qubes-core-admin
that referenced
this pull request
Jul 3, 2026
ben-grande
added a commit
to ben-grande/qubes-core-admin
that referenced
this pull request
Jul 6, 2026
marmarek
requested changes
Jul 10, 2026
Comment on lines
+89
to
+90
| sprintf(used_mem_buf, "%lld", used_mem); | ||
| sprintf(used_swap_buf, "%lld", used_swap); |
| syslog(LOG_DAEMON | LOG_ERR, "error writing meminfo to xenstore ?"); | ||
| exit(1); | ||
| } | ||
| if (!xs_write(xs, XBT_NULL, "memory/swapinfo", swap, strlen(swap))) { |
Member
There was a problem hiding this comment.
Note to self: this can be merged only after core-admin part, which sets necessary xenstore access.
| char *swap; | ||
| } UsedMem; | ||
|
|
||
| UsedMem parse(const char *meminfo_buf, const char* dom_current_buf) |
Member
There was a problem hiding this comment.
FWIW the usual method in C for returning more results is to either return a pointer to a structure (usually dynamically allocated via malloc), or add output parameters (pointers to where function should write result). In case of a simple structure like this, compiler will do the latter for you here, so it can stay this way, but keep in mind it wont be efficient code in more complex cases.
3 tasks
orbisai0security
added a commit
to orbisai0security/qubes-linux-utils
that referenced
this pull request
Jul 11, 2026
…hardening) Both sprintf() calls write at most ~20 bytes into buffers of 32 and 4096 bytes respectively, so no overflow is possible with valid input. Replacing with snprintf() is still correct defensive practice per CWE-676 and mirrors the change already made in QubesOS#140. Add unit tests for parse() that verify the memory-usage calculation and threshold/hysteresis logic. The tests pass with either sprintf() or snprintf(), confirming this is hardening rather than a bug fix. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
ben-grande
commented
Jul 13, 2026
| return (UsedMem){ .mem = used_mem_buf, .swap = used_swap_buf }; | ||
| } | ||
| return NULL; | ||
| return (UsedMem){ .mem = NULL, .swap = NULL }; |
Author
There was a problem hiding this comment.
Report swap change if above threshold despite memory being below its threshold.
| if (meminfo_data) | ||
| send_to_qmemman(xs, meminfo_data); | ||
| UsedMem meminfo_data = parse(meminfo_buf, dom_current_buf); | ||
| if (meminfo_data.mem && meminfo_data.mem[0]) |
Author
There was a problem hiding this comment.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Allows distinguishing how much memory the qube is using from what is assigned by using "meminfo - swapinfo".
For: QubesOS/qubes-core-admin#827
Tested briefly.