Skip to content

Commit 505d0be

Browse files
bcolesbcoles
committed
Clarify phys/virt addresses in output
1 parent adeaba3 commit 505d0be

22 files changed

Lines changed: 41 additions & 41 deletions

‎src/inference/arm64_va_bits_mmap.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ static void arm64_va_bits_mmap_run(struct kasld_analysis_ctx *ctx) {
7878
ARM64_VA48_PAGE_OFFSET <= ctx->page_offset_max) {
7979
if (verbose && !quiet)
8080
fprintf(stdout,
81-
"[infer] page_offset_min tightened by arm64_va_bits_mmap"
81+
"[infer] virt_page_offset_min tightened by arm64_va_bits_mmap"
8282
" (VA_BITS<=48 confirmed): %#lx -> %#lx\n",
8383
ctx->page_offset_min, ARM64_VA48_PAGE_OFFSET);
8484
ctx->page_offset_min = ARM64_VA48_PAGE_OFFSET;
@@ -94,7 +94,7 @@ static void arm64_va_bits_mmap_run(struct kasld_analysis_ctx *ctx) {
9494
ARM64_VA52_PAGE_OFFSET < ctx->page_offset_max) {
9595
if (verbose && !quiet)
9696
fprintf(stdout,
97-
"[infer] page_offset_max tightened by arm64_va_bits_mmap"
97+
"[infer] virt_page_offset_max tightened by arm64_va_bits_mmap"
9898
" (VA_BITS>=52 confirmed): %#lx -> %#lx\n",
9999
ctx->page_offset_max, ARM64_VA52_PAGE_OFFSET);
100100
ctx->page_offset_max = ARM64_VA52_PAGE_OFFSET;

‎src/inference/boot_params_align.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static void boot_params_align_run(struct kasld_analysis_ctx *ctx) {
123123
if (kernel_alignment > ctx->layout->kaslr_align) {
124124
if (verbose && !quiet)
125125
fprintf(stdout,
126-
"[infer] boot_params_align: kaslr_align updated"
126+
"[infer] boot_params_align: virt_kaslr_align updated"
127127
" %#lx -> %#lx\n",
128128
ctx->layout->kaslr_align, kernel_alignment);
129129
ctx->layout->kaslr_align = kernel_alignment;
@@ -147,7 +147,7 @@ static void boot_params_align_run(struct kasld_analysis_ctx *ctx) {
147147
if (virt_max > KASLR_BASE_MIN && virt_max < ctx->text_base_max) {
148148
if (verbose && !quiet)
149149
fprintf(stdout,
150-
"[infer] text_base_max tightened by boot_params_align"
150+
"[infer] virt_text_base_max tightened by boot_params_align"
151151
" (align snap): %#lx -> %#lx\n",
152152
ctx->text_base_max, virt_max);
153153
ctx->text_base_max = virt_max;
@@ -178,7 +178,7 @@ static void boot_params_align_run(struct kasld_analysis_ctx *ctx) {
178178
if (new_virt_max > KASLR_BASE_MIN && new_virt_max < ctx->text_base_max) {
179179
if (verbose && !quiet)
180180
fprintf(stdout,
181-
"[infer] text_base_max tightened by boot_params_align"
181+
"[infer] virt_text_base_max tightened by boot_params_align"
182182
" (init_size): %#lx -> %#lx (init_size=%#lx)\n",
183183
ctx->text_base_max, new_virt_max, init_size);
184184
ctx->text_base_max = new_virt_max;

‎src/inference/config_max_offset_bound.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static void config_max_offset_bound_run(struct kasld_analysis_ctx *ctx) {
109109
if (new_max > ctx->text_base_min && new_max < ctx->text_base_max) {
110110
if (verbose && !quiet)
111111
fprintf(stdout,
112-
"[infer] text_base_max tightened by config_max_offset_bound:"
112+
"[infer] virt_text_base_max tightened by config_max_offset_bound:"
113113
" %#lx -> %#lx (CONFIG_RANDOMIZE_BASE_MAX_OFFSET=%#lx)\n",
114114
ctx->text_base_max, new_max, max_offset);
115115
ctx->text_base_max = new_max;

‎src/inference/cpuinfo_phys_bits.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ static void cpuinfo_phys_bits_run(struct kasld_analysis_ctx *ctx) {
145145
if (virt_ceiling > kaslr_min && virt_ceiling < ctx->text_base_max) {
146146
if (verbose && !quiet)
147147
fprintf(stdout,
148-
"[infer] text_base_max tightened by cpuinfo_phys_bits:"
148+
"[infer] virt_text_base_max tightened by cpuinfo_phys_bits:"
149149
" %#lx -> %#lx (phys_bits=%d)\n",
150150
ctx->text_base_max, virt_ceiling, phys_bits);
151151
ctx->text_base_max = virt_ceiling;

‎src/inference/directmap_page_offset_bounds.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static void directmap_page_offset_bounds_run(struct kasld_analysis_ctx *ctx) {
9595
if (vdmap_min >= ctx->page_offset_min && vdmap_min < ctx->page_offset_max) {
9696
if (verbose && !quiet)
9797
fprintf(stdout,
98-
"[infer] page_offset_max tightened by"
98+
"[infer] virt_page_offset_max tightened by"
9999
" directmap_page_offset_bounds: %#lx -> %#lx\n",
100100
ctx->page_offset_max, vdmap_min);
101101
ctx->page_offset_max = vdmap_min;
@@ -132,7 +132,7 @@ static void directmap_page_offset_bounds_run(struct kasld_analysis_ctx *ctx) {
132132
if (lower > ctx->page_offset_min && lower < ctx->page_offset_max) {
133133
if (verbose && !quiet)
134134
fprintf(stdout,
135-
"[infer] page_offset_min tightened by"
135+
"[infer] virt_page_offset_min tightened by"
136136
" directmap_page_offset_bounds: %#lx -> %#lx"
137137
" (MemTotal=%lu bytes)\n",
138138
ctx->page_offset_min, lower, mem_bytes);

‎src/inference/dram_bound.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static void dram_bound_run(struct kasld_analysis_ctx *ctx) {
9898
virt_lo < ctx->text_base_max) {
9999
if (verbose && !quiet)
100100
fprintf(stdout,
101-
"[infer] text_base_min tightened by dram_bound:"
101+
"[infer] virt_text_base_min tightened by dram_bound:"
102102
" %#lx -> %#lx (min PHYS/DRAM=%#lx)\n",
103103
ctx->text_base_min, virt_lo, pdram_lo);
104104
ctx->text_base_min = virt_lo;

‎src/inference/dram_ceiling.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void dram_ceiling_run(struct kasld_analysis_ctx *ctx) {
144144
if (virt_ceiling > kaslr_min && virt_ceiling < ctx->text_base_max) {
145145
if (verbose && !quiet)
146146
fprintf(stdout,
147-
"[infer] text_base_max tightened by dram_ceiling:"
147+
"[infer] virt_text_base_max tightened by dram_ceiling:"
148148
" %#lx -> %#lx (dram_top=%#lx kernel_size=%#lx)\n",
149149
ctx->text_base_max, virt_ceiling, dram_top, kernel_size);
150150
ctx->text_base_max = virt_ceiling;

‎src/inference/highmem_32bit_bound.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ static void highmem_32bit_bound_run(struct kasld_analysis_ctx *ctx) {
141141
if (virt_ceiling > kaslr_min && virt_ceiling < ctx->text_base_max) {
142142
if (verbose && !quiet)
143143
fprintf(stdout,
144-
"[infer] text_base_max tightened by highmem_32bit_bound:"
144+
"[infer] virt_text_base_max tightened by highmem_32bit_bound:"
145145
" %#lx -> %#lx (LowTotal=%lu kB, HighTotal=%lu kB)\n",
146146
ctx->text_base_max, virt_ceiling, lowtotal / 1024,
147147
hightotal / 1024);

‎src/inference/image_size_from_text_data_gap.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static void image_size_from_text_data_gap_run(struct kasld_analysis_ctx *ctx) {
9797
if (verbose && !quiet)
9898
fprintf(
9999
stdout,
100-
"[infer] text_base_max tightened by image_size_from_text_data_gap:"
100+
"[infer] virt_text_base_max tightened by image_size_from_text_data_gap:"
101101
" %#lx -> %#lx (gap=%#lx, min_text=%#lx, max_data=%#lx)\n",
102102
ctx->text_base_max, new_max, gap, min_text, max_data);
103103
ctx->text_base_max = new_max;

‎src/inference/kaslr_ceiling.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static void kaslr_ceiling_run(struct kasld_analysis_ctx *ctx) {
179179
if (new_max > kaslr_min && new_max < ctx->text_base_max) {
180180
if (verbose && !quiet)
181181
fprintf(stdout,
182-
"[infer] text_base_max tightened by kaslr_ceiling:"
182+
"[infer] virt_text_base_max tightened by kaslr_ceiling:"
183183
" %#lx -> %#lx (kernel_size=%#lx)\n",
184184
ctx->text_base_max, new_max, kernel_size);
185185
ctx->text_base_max = new_max;

0 commit comments

Comments
 (0)