mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 07:15:18 +00:00
Code Issues Releases Wiki Activity

Merge aa-status: Fix malformed json output

Browse Source 
In some cases (if profiles in complain _and_ enforce mode are loaded), the `i` loop runs more
than once, which also means `j == 0` is true in the middle of the json.
This causes invalid json.

This patch fixes this.

This is a regression related to 22aa9b6161
/ https://gitlab.com/apparmor/apparmor/-/merge_requests/964 /
https://gitlab.com/apparmor/apparmor/-/issues/295
which fixed another case of invalid json if a process was unconfined
while having a profile defined.

Note: I also tested this patch for the "unconfined, but has a profile
defined" case to ensure it doesn't break what
22aa9b6161 fixed.

This fix is needed in all branches that also got !964 (which means 3.1 and 3.0).

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1036
Approved-by: John Johansen <john@jjmx.net>
Merged-by: John Johansen <john@jjmx.net>
This commit is contained in:
John Johansen
2023-05-19 20:33:20 +00:00
parent e7f1b882f7 f72c001643
commit 88d2bf45a4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
binutils/aa_status.c
View File

@@ -620,6 +620,7 @@ static int detailed_processes(FILE *outf, filters_t *filters, bool json,
struct process *processes, size_t nprocesses) { struct process *processes, size_t nprocesses) {
int ret; int ret;
size_t i; size_t i;
int need_finish = 0;
if (json) { if (json) {
fprintf(outf, "\"processes\": {"); fprintf(outf, "\"processes\": {");
@@ -677,19 +678,22 @@ static int detailed_processes(FILE *outf, filters_t *filters, bool json,
} else { } else {
fprintf(outf, "%s\"%s\": [{\"profile\": \"%s\", \"pid\": \"%s\", \"status\": \"%s\"}", fprintf(outf, "%s\"%s\": [{\"profile\": \"%s\", \"pid\": \"%s\", \"status\": \"%s\"}",
// first element will be a unique executable // first element will be a unique executable
j == 0 ? "" : "], ", j == 0 && !need_finish ? "" : "], ",
filtered[j].exe, filtered[j].profile, filtered[j].pid, filtered[j].mode); filtered[j].exe, filtered[j].profile, filtered[j].pid, filtered[j].mode);
} }
need_finish = 1;
} }
if (j > 0) {
fprintf(outf, "]");
}
} }
free_processes(filtered, nfiltered); free_processes(filtered, nfiltered);
} }
if (json) { if (json) {
fprintf(outf, "}}\n"); if (need_finish > 0) {
fprintf(outf, "]");
}
fprintf(outf, "}\n");
} }
exit: exit: