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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1242FC433EF for ; Thu, 24 Feb 2022 00:21:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9D6D18D0003; Wed, 23 Feb 2022 19:21:22 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 985DE8D0001; Wed, 23 Feb 2022 19:21:22 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 827898D0003; Wed, 23 Feb 2022 19:21:22 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id 5E9808D0001 for ; Wed, 23 Feb 2022 19:21:22 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0BF24207B2 for ; Thu, 24 Feb 2022 00:21:22 +0000 (UTC) X-FDA: 79175769204.09.A4E951F Received: from mail-vs1-f51.google.com (mail-vs1-f51.google.com [209.85.217.51]) by imf10.hostedemail.com (Postfix) with ESMTP id 80F75C0003 for ; Thu, 24 Feb 2022 00:21:21 +0000 (UTC) Received: by mail-vs1-f51.google.com with SMTP id e26so492818vso.3 for ; Wed, 23 Feb 2022 16:21:21 -0800 (PST) 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=9ucQ1DTIJLBq5JuNolG9KsICDWacOn6WqXrjGTHgRbY=; b=Za6VIVnsDF95qecvmFHieKfp30boPKOB6V/kqjA7sDYaNkTOS9shtROcEdhKuUiGeQ WZcpXy1qd0tL4L2VW5RBDiBq+HTJCLJa54aiJQpBdzrc0MOjRjeVjTJ4PcCnGO6shiBj 7vw9Yh9gf1LvUf5+RKNKxXUyPLs5irZ1F7Yqk4HC9VTvYjjvrd2OvOBN47cN9D04XjTz q7H35oIVNjaSbzoPf77EWtJ3v0wX5VhVHutj2PLukue0E0PLL1QSB72d6JWmnavNTU+h fBb/5fETbgp38XLUZ2Cxc+gp0SBg9z0Gb3KHGCfg3I0HHminNAOvOZPEUCslqYBCyIry 80XQ== 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=9ucQ1DTIJLBq5JuNolG9KsICDWacOn6WqXrjGTHgRbY=; b=RDRmFcQf/C0TTCQp3QIm4vJbWhC68A4BBhyfMSlpdrvaJQ/M1FcV8GHAtP7cPrzEwY Blqn6hAEYnPfJPByOyaFNyeQjVv81xoXOkuBxePp11XuK7J0lgUrTFL+cyL4mdorjaWp FEFvugKsH3XsQw4RS5hHkGBv4XmDjScDSc+Kz9L+s5JbcDse+zZ7yuLZ0rMFTUDiAv9D oL3gd4rJa1DwI5vYYjIGx3uf5VaVC3EENd7aYTYDKbm72xMQWJR+/qv7xJFx9AVPI+/G +omkFT566iNhvIVriDI5iJnkiHzbuO2jbcFJrmyLjEcWRud1ZFOsdlhzDEXHrBpgrvZ8 gt1Q== X-Gm-Message-State: AOAM530WeA0UraxBv4JHzHGlyD0Xp+4sjqbFjbOVHvRtg2iIaqeSmtpK x8tbonko++C3KJMg32NpDH8nlmsv6GNTaXFglUsr8Q== X-Google-Smtp-Source: ABdhPJxg4WD8p/h/YealQ4a344YFkyDUBXzqwn0B7MRxC+bjfuaxX7E04calQVpmufW4DG1pNyZtm+VetDPdSg/br2U= X-Received: by 2002:a67:ca1b:0:b0:30b:9d28:1ce5 with SMTP id z27-20020a67ca1b000000b0030b9d281ce5mr96888vsk.61.1645662080375; Wed, 23 Feb 2022 16:21:20 -0800 (PST) MIME-Version: 1.0 References: <20220219012643.892158-1-pcc@google.com> In-Reply-To: From: Peter Collingbourne Date: Wed, 23 Feb 2022 16:21:09 -0800 Message-ID: Subject: Re: [PATCH] kasan: fix more unit tests with CONFIG_UBSAN_LOCAL_BOUNDS enabled To: Marco Elver Cc: Andrey Konovalov , Kees Cook , Andrew Morton , Linux Memory Management List , "# 3.4.x" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 80F75C0003 X-Stat-Signature: jm7ega8kp4quupdfiiciir5rw6kwf9q7 Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Za6VIVns; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf10.hostedemail.com: domain of pcc@google.com designates 209.85.217.51 as permitted sender) smtp.mailfrom=pcc@google.com X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1645662081-888847 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, Feb 21, 2022 at 3:20 AM Marco Elver wrote: > > On Sat, 19 Feb 2022 at 02:26, Peter Collingbourne wrote: > > > > This is a followup to commit f649dc0e0d7b ("kasan: fix unit tests > > with CONFIG_UBSAN_LOCAL_BOUNDS enabled") that fixes tests that fail > > as a result of __alloc_size annotations being added to the kernel > > allocator functions. > > > > Link: https://linux-review.googlesource.com/id/I4334cafc5db600fda5cebb851b2ee9fd09fb46cc > > Signed-off-by: Peter Collingbourne > > Cc: # 5.16.x > > Fixes: c37495d6254c ("slab: add __alloc_size attributes for better bounds checking") > > --- > > lib/test_kasan.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > > index 26a5c9007653..3bf8801d0e66 100644 > > --- a/lib/test_kasan.c > > +++ b/lib/test_kasan.c > > @@ -177,7 +177,8 @@ static void kmalloc_node_oob_right(struct kunit *test) > > */ > > static void kmalloc_pagealloc_oob_right(struct kunit *test) > > { > > - char *ptr; > > + /* See comment in kasan_global_oob_right. */ > > + char *volatile ptr; > > size_t size = KMALLOC_MAX_CACHE_SIZE + 10; > > I think more recently we've been using OPTIMIZER_HIDE_VAR() to hide > things from the compiler. Does OPTIMIZER_HIDE_VAR(ptr) right before > the access also work in this case? > > I leave it to you which you think is cleaner - I'm guessing that we > might want to avoid volatile if we can. Okay, sent v2 which uses OPTIMIZER_HIDE_VAR. Peter