Skip to content

Commit f2f6490

Browse files
committed
clang-format
1 parent 505d0be commit f2f6490

3 files changed

Lines changed: 23 additions & 19 deletions

File tree

src/inference/image_size_from_text_data_gap.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ static void image_size_from_text_data_gap_run(struct kasld_analysis_ctx *ctx) {
9595
if (new_max > kaslr_min && new_max > ctx->text_base_min &&
9696
new_max < ctx->text_base_max) {
9797
if (verbose && !quiet)
98-
fprintf(
99-
stdout,
100-
"[infer] virt_text_base_max tightened by image_size_from_text_data_gap:"
101-
" %#lx -> %#lx (gap=%#lx, min_text=%#lx, max_data=%#lx)\n",
102-
ctx->text_base_max, new_max, gap, min_text, max_data);
98+
fprintf(stdout,
99+
"[infer] virt_text_base_max tightened by "
100+
"image_size_from_text_data_gap:"
101+
" %#lx -> %#lx (gap=%#lx, min_text=%#lx, max_data=%#lx)\n",
102+
ctx->text_base_max, new_max, gap, min_text, max_data);
103103
ctx->text_base_max = new_max;
104104
}
105105
}

src/inference/ppc32_booke_phys_ceiling.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,11 @@ static void ppc32_booke_phys_ceiling_run(struct kasld_analysis_ctx *ctx) {
114114

115115
if (virt_ceiling > kaslr_min && virt_ceiling < ctx->text_base_max) {
116116
if (verbose && !quiet)
117-
fprintf(stdout,
118-
"[infer] virt_text_base_max tightened by ppc32_booke_phys_ceiling:"
119-
" %#lx -> %#lx (MemTotal=%lu MiB cap=%lu MiB)\n",
120-
ctx->text_base_max, virt_ceiling, mem_bytes >> 20, cap >> 20);
117+
fprintf(
118+
stdout,
119+
"[infer] virt_text_base_max tightened by ppc32_booke_phys_ceiling:"
120+
" %#lx -> %#lx (MemTotal=%lu MiB cap=%lu MiB)\n",
121+
ctx->text_base_max, virt_ceiling, mem_bytes >> 20, cap >> 20);
121122
ctx->text_base_max = virt_ceiling;
122123
}
123124

src/inference/x86_64_la57_from_directmap.c

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ static void x86_64_la57_from_directmap_run(struct kasld_analysis_ctx *ctx) {
5252
#if defined(__x86_64__)
5353
/* L4 kernel VAS floor: any DIRECTMAP below this is exclusively L5. */
5454
#define X86_64_L4_VAS_START 0xffff800000000000ul
55-
/* __PAGE_OFFSET_BASE_L5: directmap floor under L5 paging. CONFIG_RANDOMIZE_MEMORY
56-
* only randomises page_offset_base upward from this base, and the regions
57-
* below it ([0xff10..., 0xff11...) LDT remap, [0xff00..., 0xff10...) guard
58-
* hole) are never used as the directmap base. */
55+
/* __PAGE_OFFSET_BASE_L5: directmap floor under L5 paging.
56+
* CONFIG_RANDOMIZE_MEMORY only randomises page_offset_base upward from this
57+
* base, and the regions below it ([0xff10..., 0xff11...) LDT remap, [0xff00...,
58+
* 0xff10...) guard hole) are never used as the directmap base. */
5959
#define X86_64_L5_PO_BASE 0xff11000000000000ul
6060

6161
int have_l5 = 0; /* any valid DIRECTMAP result below X86_64_L4_VAS_START */
@@ -93,7 +93,8 @@ static void x86_64_la57_from_directmap_run(struct kasld_analysis_ctx *ctx) {
9393
X86_64_L5_PO_BASE <= ctx->page_offset_max) {
9494
if (verbose && !quiet)
9595
fprintf(stdout,
96-
"[infer] virt_page_offset_min tightened by x86_64_la57_from_directmap"
96+
"[infer] virt_page_offset_min tightened by "
97+
"x86_64_la57_from_directmap"
9798
" (L5): %#lx -> %#lx\n",
9899
ctx->page_offset_min, X86_64_L5_PO_BASE);
99100
ctx->page_offset_min = X86_64_L5_PO_BASE;
@@ -102,7 +103,8 @@ static void x86_64_la57_from_directmap_run(struct kasld_analysis_ctx *ctx) {
102103
if (l5_max < ctx->page_offset_max && l5_max >= ctx->page_offset_min) {
103104
if (verbose && !quiet)
104105
fprintf(stdout,
105-
"[infer] virt_page_offset_max tightened by x86_64_la57_from_directmap"
106+
"[infer] virt_page_offset_max tightened by "
107+
"x86_64_la57_from_directmap"
106108
" (L5): %#lx -> %#lx\n",
107109
ctx->page_offset_max, l5_max);
108110
ctx->page_offset_max = l5_max;
@@ -115,10 +117,11 @@ static void x86_64_la57_from_directmap_run(struct kasld_analysis_ctx *ctx) {
115117
if (X86_64_L4_VAS_START > ctx->page_offset_min &&
116118
X86_64_L4_VAS_START <= ctx->page_offset_max) {
117119
if (verbose && !quiet)
118-
fprintf(stdout,
119-
"[infer] virt_page_offset_min tightened by x86_64_la57_from_directmap"
120-
" (L4): %#lx -> %#lx\n",
121-
ctx->page_offset_min, X86_64_L4_VAS_START);
120+
fprintf(
121+
stdout,
122+
"[infer] virt_page_offset_min tightened by x86_64_la57_from_directmap"
123+
" (L4): %#lx -> %#lx\n",
124+
ctx->page_offset_min, X86_64_L4_VAS_START);
122125
ctx->page_offset_min = X86_64_L4_VAS_START;
123126
}
124127
#else

0 commit comments

Comments
 (0)