From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 469EAC433EF for ; Fri, 24 Sep 2021 14:35:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BF0361164 for ; Fri, 24 Sep 2021 14:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346890AbhIXOhJ (ORCPT ); Fri, 24 Sep 2021 10:37:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346879AbhIXOhF (ORCPT ); Fri, 24 Sep 2021 10:37:05 -0400 Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6224C061571 for ; Fri, 24 Sep 2021 07:35:31 -0700 (PDT) Received: by mail-yb1-xb2e.google.com with SMTP id r4so6185594ybp.4 for ; Fri, 24 Sep 2021 07:35:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=T/Ub9o1nHZLbzldoR1+kn89lBOvKBniRGbpvXkg/Lws=; b=qp6ZzxPOKAQ8qeuCBY5JCBFNvVolTFiS5QJUYREJsnkUdwUUCJLPUBOg13T5ZXAt3u I4ZgqmlNomr/sqoOiR1LLW4Zl+hl2l14qUH9xY2DSyyQC4sOMt0emS+Ic+xodUpLgfae A038DKmM7UnSe3vF3dRhpaJlusuypitUk1V5jgnh+NvjoiR03rGthOCfsptxRzpqqlAb 8IGC9tmfCQSWelvsbcFs7h/GaWozRdoTfYKxHQ6I5BliJcFb9p6S4vZBT4bk+eMTGkKo Walqa0qAyW50cXsiEB6lQIqTZUj/LqjoiCCiX6oKtf/ageRbxGSje0E3JFwoK9WLYNwC wjdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=T/Ub9o1nHZLbzldoR1+kn89lBOvKBniRGbpvXkg/Lws=; b=sBAEzjRCaxDQxiq81CYZ4r80GzN9xLhbg6oszu1PDEzC/S8zjTPsE01OeOJFLQc7+b g8rlPBtaYlGDYO8bT9IHe0Z/dbPUQMx+frA0Dxhwr7hvPP/M0plPTEiwZz1VLJBCApYO 8gww3ecZXDUE9gNQb0dGRSdEcBUYUs8em5OvRh5dtt4QZrrB/7AIRJdWwW+EY4ZYW5So NsfXXGtwLc0YooDgXjGnRizX/rqDKQ+07UnmWOBsW9RkL6p4fHwzJrNtqUbwLehij066 lFuxrIY3X3ut4/fBowxnfzRE5d3cWATuUJknghdyZOoJdFceA5iwRfCO5wzhXgKQ+cxD j68Q== X-Gm-Message-State: AOAM530Jlit+8Efe8IHY/02KGeQbfMqJKHb70rjf32TMTtpC8zCrSj3r VBkqbbIPlrIxRd78EbZ2aXbB/rDM+6qEWosk2BSA9I5WndI= X-Google-Smtp-Source: ABdhPJyC0J5iolEmiySIkflhvFYnRo92b050ZN6hy/g7sKlzcRi3NyQdQdaanFVAjHwucoJ9rXOIDi7Ba06guk3ium4= X-Received: by 2002:a25:2e0f:: with SMTP id u15mr13653133ybu.133.1632494130630; Fri, 24 Sep 2021 07:35:30 -0700 (PDT) MIME-Version: 1.0 References: <20210923095316.13867-1-yee.lee@mediatek.com> <5f7a9ed1dabba25596c38a8e7c32ee5750b80459.camel@mediatek.com> In-Reply-To: <5f7a9ed1dabba25596c38a8e7c32ee5750b80459.camel@mediatek.com> From: Sami Tolvanen Date: Fri, 24 Sep 2021 07:35:19 -0700 Message-ID: Subject: Re: [PATCH] scs: Release kasan vmalloc poison in scs_free process To: Kuan-Ying Lee Cc: yee.lee@mediatek.com, LKML , nicholas.Tang@mediatek.com, chinwen.chang@mediatek.com, Matthias Brugger , Will Deacon , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 23, 2021 at 4:19 AM Kuan-Ying Lee wrote: > > On Thu, 2021-09-23 at 17:53 +0800, yee.lee@mediatek.com wrote: > > From: Yee Lee > > > > Since scs allocation has been moved to vmalloc region, the > > shadow stack is protected by kasan_posion_vmalloc. > > However, the vfree_atomic operation needs to access > > its context for scs_free process and causes kasan error > > as the dump info below. > > > > This patch Adds kasan_unpoison_vmalloc() before vfree_atomic, > > which aligns to the prior flow as using kmem_cache. > > The vmalloc region will go back posioned in the following > > vumap() operations. > > > > ================================================================== > > BUG: KASAN: vmalloc-out-of-bounds in llist_add_batch+0x60/0xd4 > > Write of size 8 at addr ffff8000100b9000 by task kthreadd/2 > > > > CPU: 0 PID: 2 Comm: kthreadd Not tainted 5.15.0-rc2-11681-(skip) > > Hardware name: linux,dummy-virt (DT) > > Call trace: > > dump_backtrace+0x0/0x43c > > show_stack+0x1c/0x2c > > dump_stack_lvl+0x68/0x84 > > print_address_description+0x80/0x394 > > kasan_report+0x180/0x1dc > > __asan_report_store8_noabort+0x48/0x58 > > llist_add_batch+0x60/0xd4 > > vfree_atomic+0x60/0xe0 > > scs_free+0x1dc/0x1fc > > scs_release+0xa4/0xd4 > > free_task+0x30/0xe4 > > __put_task_struct+0x1ec/0x2e0 > > delayed_put_task_struct+0x5c/0xa0 > > rcu_do_batch+0x62c/0x8a0 > > rcu_core+0x60c/0xc14 > > rcu_core_si+0x14/0x24 > > __do_softirq+0x19c/0x68c > > irq_exit+0x118/0x2dc > > handle_domain_irq+0xcc/0x134 > > gic_handle_irq+0x7c/0x1bc > > call_on_irq_stack+0x40/0x70 > > do_interrupt_handler+0x78/0x9c > > el1_interrupt+0x34/0x60 > > el1h_64_irq_handler+0x1c/0x2c > > el1h_64_irq+0x78/0x7c > > _raw_spin_unlock_irqrestore+0x40/0xcc > > sched_fork+0x4f0/0xb00 > > copy_process+0xacc/0x3648 > > kernel_clone+0x168/0x534 > > kernel_thread+0x13c/0x1b0 > > kthreadd+0x2bc/0x400 > > ret_from_fork+0x10/0x20 > > > > Memory state around the buggy address: > > ffff8000100b8f00: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 > > ffff8000100b8f80: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 > > >ffff8000100b9000: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 > > ^ > > ffff8000100b9080: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 > > ffff8000100b9100: f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 f8 > > ================================================================== > > > > CC: Matthias Brugger > > CC: Will Deacon > > CC: Sami Tolvanen > > Signed-off-by: Yee Lee > > --- > > kernel/scs.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/kernel/scs.c b/kernel/scs.c > > index e2a71fc82fa0..25c0d8e416e6 100644 > > --- a/kernel/scs.c > > +++ b/kernel/scs.c > > @@ -68,6 +68,7 @@ void scs_free(void *s) > > > > __scs_account(s, -1); > > > > + kasan_unpoison_vmalloc(s, SCS_SIZE); > > /* > > * We cannot sleep as this can be called in interrupt context, > > * so use this_cpu_cmpxchg to update the cache, and > > vfree_atomic > > I'm not sure if we need to add kasan_unpoison_vmalloc() and > kasan_poison_vmalloc() in this file. > > As far as I know, vmalloc() and vfree() will do these two functions. The idea here is to poison the shadow stack after it's set up to catch unintentional accesses. Outside of compiler instrumentation, nothing should read or write from this buffer while the task is running. Sami