On Tue, Nov 10, 2020 at 11:11 PM Andrey Konovalov <andreyknvl@xxxxxxxxxx> wrote:
>
> This is a preparatory commit for the upcoming addition of a new hardware
> tag-based (MTE-based) KASAN mode.
>
> Hardware tag-based KASAN won't be using shadow memory, but will reuse
> this function. Rename "shadow" to implementation-neutral "metadata".
>
> No functional changes.
>
> Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx>
> Reviewed-by: Marco Elver <elver@xxxxxxxxxx>
Reviewed-by: Alexander Potapenko <glider@xxxxxxxxxx>
> ---
> Change-Id: I18397dddbed6bc6d365ddcaf063a83948e1150a5
> ---
> mm/kasan/report.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/kasan/report.c b/mm/kasan/report.c
> index 2990ca34abaf..5d5733831ad7 100644
> --- a/mm/kasan/report.c
> +++ b/mm/kasan/report.c
> @@ -252,7 +252,7 @@ static int shadow_pointer_offset(const void *row, const void *shadow)
> (shadow - row) / SHADOW_BYTES_PER_BLOCK + 1;
> }
>
> -static void print_shadow_for_address(const void *addr)
> +static void print_memory_metadata(const void *addr)
> {
> int i;
> const void *shadow = kasan_mem_to_shadow(addr);
> @@ -338,7 +338,7 @@ void kasan_report_invalid_free(void *object, unsigned long ip)
> pr_err("\n");
> print_address_description(object, tag);
> pr_err("\n");
> - print_shadow_for_address(object);
> + print_memory_metadata(object);
> end_report(&flags);
> }
>
> @@ -379,7 +379,7 @@ static void __kasan_report(unsigned long addr, size_t size, bool is_write,
> if (addr_has_metadata(untagged_addr)) {
> print_address_description(untagged_addr, get_tag(tagged_addr));
> pr_err("\n");
> - print_shadow_for_address(info.first_bad_addr);
> + print_memory_metadata(info.first_bad_addr);
> } else {
> dump_stack();
> }
> --
> 2.29.2.222.g5d2a92d10f8-goog
>
--
Alexander Potapenko
Software Engineer
Google Germany GmbH
Erika-Mann-Straße, 33
80636 München
Geschäftsführer: Paul Manicle, Halimah DeLaine Prado
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
