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 2544CC433F5 for ; Mon, 24 Jan 2022 18:56:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E13A6B00B3; Mon, 24 Jan 2022 13:56:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 98F726B00B6; Mon, 24 Jan 2022 13:56:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82FE06B00B7; Mon, 24 Jan 2022 13:56:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0002.hostedemail.com [216.40.44.2]) by kanga.kvack.org (Postfix) with ESMTP id 70CBC6B00B3 for ; Mon, 24 Jan 2022 13:56:36 -0500 (EST) Received: from smtpin30.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 2EF0185414 for ; Mon, 24 Jan 2022 18:56:36 +0000 (UTC) X-FDA: 79066086792.30.855793B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id 5F5E0180021 for ; Mon, 24 Jan 2022 18:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643050594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OmJVF3D4x24T0ZfBgEiGjVTIdFS2FiU3zC/rm7HZ71k=; b=UBsX8t7tAUwtAWb6ENnWdHzp95zO2kLM+hfNK4ZWFiOnLujQOrJonURZyEpEQSgm9+vfmr P+nPi2I+9BP4TDcVmyakukTWqGfkavp68cozzxQaR7vo4sKDBZZqF82MgOiAZdKkS9bhKa 6PhMcL1YGgLY+BsPaJjssqyvGwI1F5k= Received: from mail-io1-f69.google.com (mail-io1-f69.google.com [209.85.166.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-1E4qKYk6NWW2v1ab6zLrTQ-1; Mon, 24 Jan 2022 13:56:33 -0500 X-MC-Unique: 1E4qKYk6NWW2v1ab6zLrTQ-1 Received: by mail-io1-f69.google.com with SMTP id k2-20020a6bba02000000b00604f85cceffso12842097iof.11 for ; Mon, 24 Jan 2022 10:56:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=OmJVF3D4x24T0ZfBgEiGjVTIdFS2FiU3zC/rm7HZ71k=; b=oUK2G2DsfYMqis9cWp4yuX91JPSZUw3TpP7bfwu57lMyJLU3kCIobWOcRi1HbN4gs8 7yH31vFSn4hrgiDEPmGgR32PMwIErunvYbO+ctcW/fn+eY+ENT/jNY1Qp9HJ6hvbmG87 NlwcqTkcNGLKk5cfoaaYIlvw2eIDDDgwRlsGyOrDixxiBzArFQlu3k115n/tO2fAEnDD GbcBFBNQ2Emi9DLDUPFPS/CSWyP8TP8xqslaswPh7Vi9BgP+kzkCvOxEjc8++DJ2mwP2 IUTi72+q+i/UBp/NB9/j9C0GiYZnFUOk5YWdrVAZQTweeCOjoSAvP1yITPZuH7cymzi9 bWMQ== X-Gm-Message-State: AOAM533/NoBcRhokDZB4CoRVw1sMe0spMz+upefm0fOk++ZRz3MdECfe 7saqZZ1NF+XAkLCCPUrSj2p3Sqy/bQ5t5gBK/StFMVzaFE3MiHoqQbWLDtpoTpEvT+Wc2AyQj8J mwrJ6UFQYFk8= X-Received: by 2002:a05:6e02:1648:: with SMTP id v8mr9493334ilu.286.1643050592801; Mon, 24 Jan 2022 10:56:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJyUqwnG4LX6ZXdLQROl5ZTg/5K5xkSA6GPAXQwKR1q5FUNoabgTH0XU1cWTt8kmPKmKuywIrQ== X-Received: by 2002:a05:6e02:1648:: with SMTP id v8mr9493326ilu.286.1643050592493; Mon, 24 Jan 2022 10:56:32 -0800 (PST) Received: from ?IPV6:2601:280:4400:a2e0::2b4c? ([2601:280:4400:a2e0::2b4c]) by smtp.gmail.com with ESMTPSA id h8sm6822557iow.15.2022.01.24.10.56.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Jan 2022 10:56:32 -0800 (PST) Message-ID: <8f457c89-28ed-71d1-5afa-2386abec6da9@redhat.com> Date: Mon, 24 Jan 2022 13:56:30 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH] kasan: test: fix compatibility with FORTIFY_SOURCE To: Marco Elver , Andrew Morton Cc: Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Kees Cook , Brendan Higgins , linux-hardening@vger.kernel.org References: <20220124160744.1244685-1-elver@google.com> From: Nico Pache In-Reply-To: <20220124160744.1244685-1-elver@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: nil X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 5F5E0180021 X-Stat-Signature: cg14ba4i16roqhwgz4gorg69cwumejpg Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UBsX8t7t; spf=none (imf06.hostedemail.com: domain of npache@redhat.com has no SPF policy when checking 170.10.129.124) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-HE-Tag: 1643050595-39322 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 1/24/22 11:07, Marco Elver wrote: > With CONFIG_FORTIFY_SOURCE enabled, string functions will also perform > dynamic checks using __builtin_object_size(ptr), which when failed will > panic the kernel. > > Because the KASAN test deliberately performs out-of-bounds operations, > the kernel panics with FORITY_SOURCE, for example: > > | kernel BUG at lib/string_helpers.c:910! > | invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI > | CPU: 1 PID: 137 Comm: kunit_try_catch Tainted: G B 5.16.0-rc3+ #3 > | Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-2 04/01/2014 > | RIP: 0010:fortify_panic+0x19/0x1b > | ... > | Call Trace: > | > | kmalloc_oob_in_memset.cold+0x16/0x16 > | ... > > Fix it by also hiding `ptr` from the optimizer, which will ensure that > __builtin_object_size() does not return a valid size, preventing > fortified string functions from panicking. > > Reported-by: Nico Pache > Signed-off-by: Marco Elver Looks good! Thanks for posting this Marco :) Reviewed-by: Nico Pache > --- > lib/test_kasan.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > index 847cdbefab46..26a5c9007653 100644 > --- a/lib/test_kasan.c > +++ b/lib/test_kasan.c > @@ -492,6 +492,7 @@ static void kmalloc_oob_in_memset(struct kunit *test) > ptr = kmalloc(size, GFP_KERNEL); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > + OPTIMIZER_HIDE_VAR(ptr); > OPTIMIZER_HIDE_VAR(size); > KUNIT_EXPECT_KASAN_FAIL(test, > memset(ptr, 0, size + KASAN_GRANULE_SIZE)); > @@ -515,6 +516,7 @@ static void kmalloc_memmove_negative_size(struct kunit *test) > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > memset((char *)ptr, 0, 64); > + OPTIMIZER_HIDE_VAR(ptr); > OPTIMIZER_HIDE_VAR(invalid_size); > KUNIT_EXPECT_KASAN_FAIL(test, > memmove((char *)ptr, (char *)ptr + 4, invalid_size)); > @@ -531,6 +533,7 @@ static void kmalloc_memmove_invalid_size(struct kunit *test) > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > memset((char *)ptr, 0, 64); > + OPTIMIZER_HIDE_VAR(ptr); > KUNIT_EXPECT_KASAN_FAIL(test, > memmove((char *)ptr, (char *)ptr + 4, invalid_size)); > kfree(ptr); > @@ -893,6 +896,7 @@ static void kasan_memchr(struct kunit *test) > ptr = kmalloc(size, GFP_KERNEL | __GFP_ZERO); > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > > + OPTIMIZER_HIDE_VAR(ptr); > OPTIMIZER_HIDE_VAR(size); > KUNIT_EXPECT_KASAN_FAIL(test, > kasan_ptr_result = memchr(ptr, '1', size + 1)); > @@ -919,6 +923,7 @@ static void kasan_memcmp(struct kunit *test) > KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr); > memset(arr, 0, sizeof(arr)); > > + OPTIMIZER_HIDE_VAR(ptr); > OPTIMIZER_HIDE_VAR(size); > KUNIT_EXPECT_KASAN_FAIL(test, > kasan_int_result = memcmp(ptr, arr, size+1)); >