Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp394758pxb; Wed, 11 Nov 2020 06:27:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJziT4FCp96pYxM9luXGNozuwZbW3XvaYqhfqpvBgsrthTabTQyNhsWk/rMEnClqSKHjJ4ij X-Received: by 2002:a17:906:8555:: with SMTP id h21mr26541678ejy.533.1605104857782; Wed, 11 Nov 2020 06:27:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605104857; cv=none; d=google.com; s=arc-20160816; b=epaeDCbNcius0sQYZK6U0Ir4DRUtkXsScEJgm6XobbNoNlGS2wYT96w92yTQJp3Ekw u1Fp8xAwlAFgefcQeUTZ4G0z19RQ7cpyoqcatltRfAg/CjA5F2LL+sHbPsk108VQggbd Fx6VBLrn4YdEUFMAek0ZPD1TBimak8QT7SellIw+hWfsy7dHERXSrhl0U+hpvIN65nYg UZYlpWNDFJfgKe0Em+5r0zftgKslEjNke8640s3/zvKvwedWGtabdoeOJ1zTzTsiAiMd 6dckLj/1Nm+poqevjt3dOsEiFJlrfC9nEgqgljr5v79wrk3QreHXwl3MtVvGqH3wX7Gq zoCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=ivzJGCKhLp1x2v+oY17etQZN4NoUxQRVrZrrn1pxmzQ=; b=xelw2iZ5rigM14FgpWOnVMQlF6lXlISXXDbHECnNVyyHj+DyXb344Nid09bLSD+aYq SCxnCOwUzLTVwrB7ug03nSO5kOmZezlChU5oWl2f42IIrwE5+zvf7EfYcvOdhp6caBq2 wgWfO0NLwv75iwO1Ny4TH9HNeCYbU1mAjL72P/kHTt3U+w0G0k+r3fuRjgl2gzD504ya jFyN/mesteBnEmsAObbJ8Qvka27uutAkRjTBK6lX8GbJFiy0vFel3cGmDo9T7MpSOgG3 KJvJ4S+aoi18NOK5H/R83roSDfo6VvijkxAXXRslPYlEIKZbFt7PikApZicEKb7h3Ta1 0Jzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=MhI88VRy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n15si1622562edt.534.2020.11.11.06.27.12; Wed, 11 Nov 2020 06:27:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=MhI88VRy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbgKKOZn (ORCPT + 99 others); Wed, 11 Nov 2020 09:25:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726039AbgKKOZm (ORCPT ); Wed, 11 Nov 2020 09:25:42 -0500 Received: from mail-qv1-xf43.google.com (mail-qv1-xf43.google.com [IPv6:2607:f8b0:4864:20::f43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E305C0613D1 for ; Wed, 11 Nov 2020 06:25:41 -0800 (PST) Received: by mail-qv1-xf43.google.com with SMTP id x13so934238qvk.8 for ; Wed, 11 Nov 2020 06:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=ivzJGCKhLp1x2v+oY17etQZN4NoUxQRVrZrrn1pxmzQ=; b=MhI88VRyKnCSohVt/b/8moDNfsbfFZlYNQiqzxMiCoC0YdUE3yesZOW9r3lkab0qdi nLTsNDYTtZW7/Tx7SbsMMFaYfEwfshUShKuAY87B4CS5Pv9u+9X/LS2GlP8KwZfgCD4G lYq0JxA7S0Jo9A4VX9wDC3zvrK8+nuwTGlMXYf2znZPt3+b2N8VcU+DkKtBOXETf6Gge qFuGoVHNqeKDPhK3zoi5jB8MprtBffAZxECn7RRrQxhmyjg0o4EwwYgfsBSeCq9MmzX2 Yt/EjBmaMtq9i8xzhStc5QGXB83wuDF64VU6zHPRoKyQNk0yYjg58xjXYkFaOIa5FJT1 HzvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=ivzJGCKhLp1x2v+oY17etQZN4NoUxQRVrZrrn1pxmzQ=; b=gzHWA4zyO7HjePd7dLRk3E3+ZRibrvCXQ9TxsqdK7ldrVVCXuEqS3Vq2fgeVmG2JpP /lWtu6PX43Yr4Pr9atW1qLM4//1i0X+sBVSfV+jkgqJuEVTL07yWQmLqBSZW0tLB6bgJ jXv/eDoqYQfAd+OhLsAm2rVZDB2ZBCrU6qnwgtPyoArrWXkW07wkpznnplwRAvzFZEyD t07Kjpm8EL8qJ5YiKP7i0lJFTkU+TdVs7mFrsECe/BDBnVLvnN26LL9SXW17Gyb3dn0M rJ3/80aEinYMxFokcKZEr8ssoXOoXU0KpzCd60pxEgSxpp3ML2ADnJFBcG6eL3WcYTFB eb4w== X-Gm-Message-State: AOAM533+b876KuVNzLFguhRlWI9QNULPPqSJdjStLQlk959rk7pZapib a3wzndQOCDti+QUjkitW49mwTG+ODxp0DeM44HJMOg== X-Received: by 2002:a0c:9e53:: with SMTP id z19mr24687355qve.23.1605104740021; Wed, 11 Nov 2020 06:25:40 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Alexander Potapenko Date: Wed, 11 Nov 2020 15:25:28 +0100 Message-ID: Subject: Re: [PATCH v9 14/44] kasan: decode stack frame only with KASAN_STACK_ENABLE To: Andrey Konovalov Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux Memory Management List , LKML Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 10, 2020 at 11:11 PM Andrey Konovalov w= rote: > > Decoding routines aren't needed when CONFIG_KASAN_STACK_ENABLE is not > enabled. Currently only generic KASAN mode implements stack error > reporting. > > No functional changes for software modes. > > Signed-off-by: Andrey Konovalov > Signed-off-by: Vincenzo Frascino > Reviewed-by: Marco Elver Reviewed-by: Alexander Potapenko > --- > Change-Id: I084e3214f2b40dc0bef7c5a9fafdc6f5c42b06a2 > --- > mm/kasan/kasan.h | 6 ++ > mm/kasan/report.c | 162 -------------------------------------- > mm/kasan/report_generic.c | 162 ++++++++++++++++++++++++++++++++++++++ > 3 files changed, 168 insertions(+), 162 deletions(-) > > diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h > index 3eff57e71ff5..d0cf61d4d70d 100644 > --- a/mm/kasan/kasan.h > +++ b/mm/kasan/kasan.h > @@ -169,6 +169,12 @@ bool check_invalid_free(void *addr); > void *find_first_bad_addr(void *addr, size_t size); > const char *get_bug_type(struct kasan_access_info *info); > > +#if defined(CONFIG_KASAN_GENERIC) && CONFIG_KASAN_STACK > +void print_address_stack_frame(const void *addr); > +#else > +static inline void print_address_stack_frame(const void *addr) { } > +#endif > + > bool kasan_report(unsigned long addr, size_t size, > bool is_write, unsigned long ip); > void kasan_report_invalid_free(void *object, unsigned long ip); > diff --git a/mm/kasan/report.c b/mm/kasan/report.c > index fff0c7befbfe..b18d193f7f58 100644 > --- a/mm/kasan/report.c > +++ b/mm/kasan/report.c > @@ -211,168 +211,6 @@ static inline bool init_task_stack_addr(const void = *addr) > sizeof(init_thread_union.stack)); > } > > -static bool __must_check tokenize_frame_descr(const char **frame_descr, > - char *token, size_t max_tok= _len, > - unsigned long *value) > -{ > - const char *sep =3D strchr(*frame_descr, ' '); > - > - if (sep =3D=3D NULL) > - sep =3D *frame_descr + strlen(*frame_descr); > - > - if (token !=3D NULL) { > - const size_t tok_len =3D sep - *frame_descr; > - > - if (tok_len + 1 > max_tok_len) { > - pr_err("KASAN internal error: frame description t= oo long: %s\n", > - *frame_descr); > - return false; > - } > - > - /* Copy token (+ 1 byte for '\0'). */ > - strlcpy(token, *frame_descr, tok_len + 1); > - } > - > - /* Advance frame_descr past separator. */ > - *frame_descr =3D sep + 1; > - > - if (value !=3D NULL && kstrtoul(token, 10, value)) { > - pr_err("KASAN internal error: not a valid number: %s\n", = token); > - return false; > - } > - > - return true; > -} > - > -static void print_decoded_frame_descr(const char *frame_descr) > -{ > - /* > - * We need to parse the following string: > - * "n alloc_1 alloc_2 ... alloc_n" > - * where alloc_i looks like > - * "offset size len name" > - * or "offset size len name:line". > - */ > - > - char token[64]; > - unsigned long num_objects; > - > - if (!tokenize_frame_descr(&frame_descr, token, sizeof(token), > - &num_objects)) > - return; > - > - pr_err("\n"); > - pr_err("this frame has %lu %s:\n", num_objects, > - num_objects =3D=3D 1 ? "object" : "objects"); > - > - while (num_objects--) { > - unsigned long offset; > - unsigned long size; > - > - /* access offset */ > - if (!tokenize_frame_descr(&frame_descr, token, sizeof(tok= en), > - &offset)) > - return; > - /* access size */ > - if (!tokenize_frame_descr(&frame_descr, token, sizeof(tok= en), > - &size)) > - return; > - /* name length (unused) */ > - if (!tokenize_frame_descr(&frame_descr, NULL, 0, NULL)) > - return; > - /* object name */ > - if (!tokenize_frame_descr(&frame_descr, token, sizeof(tok= en), > - NULL)) > - return; > - > - /* Strip line number; without filename it's not very help= ful. */ > - strreplace(token, ':', '\0'); > - > - /* Finally, print object information. */ > - pr_err(" [%lu, %lu) '%s'", offset, offset + size, token); > - } > -} > - > -static bool __must_check get_address_stack_frame_info(const void *addr, > - unsigned long *offs= et, > - const char **frame_= descr, > - const void **frame_= pc) > -{ > - unsigned long aligned_addr; > - unsigned long mem_ptr; > - const u8 *shadow_bottom; > - const u8 *shadow_ptr; > - const unsigned long *frame; > - > - BUILD_BUG_ON(IS_ENABLED(CONFIG_STACK_GROWSUP)); > - > - /* > - * NOTE: We currently only support printing frame information for > - * accesses to the task's own stack. > - */ > - if (!object_is_on_stack(addr)) > - return false; > - > - aligned_addr =3D round_down((unsigned long)addr, sizeof(long)); > - mem_ptr =3D round_down(aligned_addr, KASAN_GRANULE_SIZE); > - shadow_ptr =3D kasan_mem_to_shadow((void *)aligned_addr); > - shadow_bottom =3D kasan_mem_to_shadow(end_of_stack(current)); > - > - while (shadow_ptr >=3D shadow_bottom && *shadow_ptr !=3D KASAN_ST= ACK_LEFT) { > - shadow_ptr--; > - mem_ptr -=3D KASAN_GRANULE_SIZE; > - } > - > - while (shadow_ptr >=3D shadow_bottom && *shadow_ptr =3D=3D KASAN_= STACK_LEFT) { > - shadow_ptr--; > - mem_ptr -=3D KASAN_GRANULE_SIZE; > - } > - > - if (shadow_ptr < shadow_bottom) > - return false; > - > - frame =3D (const unsigned long *)(mem_ptr + KASAN_GRANULE_SIZE); > - if (frame[0] !=3D KASAN_CURRENT_STACK_FRAME_MAGIC) { > - pr_err("KASAN internal error: frame info validation faile= d; invalid marker: %lu\n", > - frame[0]); > - return false; > - } > - > - *offset =3D (unsigned long)addr - (unsigned long)frame; > - *frame_descr =3D (const char *)frame[1]; > - *frame_pc =3D (void *)frame[2]; > - > - return true; > -} > - > -static void print_address_stack_frame(const void *addr) > -{ > - unsigned long offset; > - const char *frame_descr; > - const void *frame_pc; > - > - if (IS_ENABLED(CONFIG_KASAN_SW_TAGS)) > - return; > - > - if (!get_address_stack_frame_info(addr, &offset, &frame_descr, > - &frame_pc)) > - return; > - > - /* > - * get_address_stack_frame_info only returns true if the given ad= dr is > - * on the current task's stack. > - */ > - pr_err("\n"); > - pr_err("addr %px is located in stack of task %s/%d at offset %lu = in frame:\n", > - addr, current->comm, task_pid_nr(current), offset); > - pr_err(" %pS\n", frame_pc); > - > - if (!frame_descr) > - return; > - > - print_decoded_frame_descr(frame_descr); > -} > - > static void print_address_description(void *addr, u8 tag) > { > struct page *page =3D kasan_addr_to_page(addr); > diff --git a/mm/kasan/report_generic.c b/mm/kasan/report_generic.c > index 7d5b9e5c7cfe..b543a1ed6078 100644 > --- a/mm/kasan/report_generic.c > +++ b/mm/kasan/report_generic.c > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -122,6 +123,167 @@ const char *get_bug_type(struct kasan_access_info *= info) > return get_wild_bug_type(info); > } > > +#if CONFIG_KASAN_STACK > +static bool __must_check tokenize_frame_descr(const char **frame_descr, > + char *token, size_t max_tok= _len, > + unsigned long *value) > +{ > + const char *sep =3D strchr(*frame_descr, ' '); > + > + if (sep =3D=3D NULL) > + sep =3D *frame_descr + strlen(*frame_descr); > + > + if (token !=3D NULL) { > + const size_t tok_len =3D sep - *frame_descr; > + > + if (tok_len + 1 > max_tok_len) { > + pr_err("KASAN internal error: frame description t= oo long: %s\n", > + *frame_descr); > + return false; > + } > + > + /* Copy token (+ 1 byte for '\0'). */ > + strlcpy(token, *frame_descr, tok_len + 1); > + } > + > + /* Advance frame_descr past separator. */ > + *frame_descr =3D sep + 1; > + > + if (value !=3D NULL && kstrtoul(token, 10, value)) { > + pr_err("KASAN internal error: not a valid number: %s\n", = token); > + return false; > + } > + > + return true; > +} > + > +static void print_decoded_frame_descr(const char *frame_descr) > +{ > + /* > + * We need to parse the following string: > + * "n alloc_1 alloc_2 ... alloc_n" > + * where alloc_i looks like > + * "offset size len name" > + * or "offset size len name:line". > + */ > + > + char token[64]; > + unsigned long num_objects; > + > + if (!tokenize_frame_descr(&frame_descr, token, sizeof(token), > + &num_objects)) > + return; > + > + pr_err("\n"); > + pr_err("this frame has %lu %s:\n", num_objects, > + num_objects =3D=3D 1 ? "object" : "objects"); > + > + while (num_objects--) { > + unsigned long offset; > + unsigned long size; > + > + /* access offset */ > + if (!tokenize_frame_descr(&frame_descr, token, sizeof(tok= en), > + &offset)) > + return; > + /* access size */ > + if (!tokenize_frame_descr(&frame_descr, token, sizeof(tok= en), > + &size)) > + return; > + /* name length (unused) */ > + if (!tokenize_frame_descr(&frame_descr, NULL, 0, NULL)) > + return; > + /* object name */ > + if (!tokenize_frame_descr(&frame_descr, token, sizeof(tok= en), > + NULL)) > + return; > + > + /* Strip line number; without filename it's not very help= ful. */ > + strreplace(token, ':', '\0'); > + > + /* Finally, print object information. */ > + pr_err(" [%lu, %lu) '%s'", offset, offset + size, token); > + } > +} > + > +static bool __must_check get_address_stack_frame_info(const void *addr, > + unsigned long *offs= et, > + const char **frame_= descr, > + const void **frame_= pc) > +{ > + unsigned long aligned_addr; > + unsigned long mem_ptr; > + const u8 *shadow_bottom; > + const u8 *shadow_ptr; > + const unsigned long *frame; > + > + BUILD_BUG_ON(IS_ENABLED(CONFIG_STACK_GROWSUP)); > + > + /* > + * NOTE: We currently only support printing frame information for > + * accesses to the task's own stack. > + */ > + if (!object_is_on_stack(addr)) > + return false; > + > + aligned_addr =3D round_down((unsigned long)addr, sizeof(long)); > + mem_ptr =3D round_down(aligned_addr, KASAN_GRANULE_SIZE); > + shadow_ptr =3D kasan_mem_to_shadow((void *)aligned_addr); > + shadow_bottom =3D kasan_mem_to_shadow(end_of_stack(current)); > + > + while (shadow_ptr >=3D shadow_bottom && *shadow_ptr !=3D KASAN_ST= ACK_LEFT) { > + shadow_ptr--; > + mem_ptr -=3D KASAN_GRANULE_SIZE; > + } > + > + while (shadow_ptr >=3D shadow_bottom && *shadow_ptr =3D=3D KASAN_= STACK_LEFT) { > + shadow_ptr--; > + mem_ptr -=3D KASAN_GRANULE_SIZE; > + } > + > + if (shadow_ptr < shadow_bottom) > + return false; > + > + frame =3D (const unsigned long *)(mem_ptr + KASAN_GRANULE_SIZE); > + if (frame[0] !=3D KASAN_CURRENT_STACK_FRAME_MAGIC) { > + pr_err("KASAN internal error: frame info validation faile= d; invalid marker: %lu\n", > + frame[0]); > + return false; > + } > + > + *offset =3D (unsigned long)addr - (unsigned long)frame; > + *frame_descr =3D (const char *)frame[1]; > + *frame_pc =3D (void *)frame[2]; > + > + return true; > +} > + > +void print_address_stack_frame(const void *addr) > +{ > + unsigned long offset; > + const char *frame_descr; > + const void *frame_pc; > + > + if (!get_address_stack_frame_info(addr, &offset, &frame_descr, > + &frame_pc)) > + return; > + > + /* > + * get_address_stack_frame_info only returns true if the given ad= dr is > + * on the current task's stack. > + */ > + pr_err("\n"); > + pr_err("addr %px is located in stack of task %s/%d at offset %lu = in frame:\n", > + addr, current->comm, task_pid_nr(current), offset); > + pr_err(" %pS\n", frame_pc); > + > + if (!frame_descr) > + return; > + > + print_decoded_frame_descr(frame_descr); > +} > +#endif /* CONFIG_KASAN_STACK */ > + > #define DEFINE_ASAN_REPORT_LOAD(size) \ > void __asan_report_load##size##_noabort(unsigned long addr) \ > { \ > -- > 2.29.2.222.g5d2a92d10f8-goog > --=20 Alexander Potapenko Software Engineer Google Germany GmbH Erika-Mann-Stra=C3=9Fe, 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg