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 X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFBF3C433E0 for ; Wed, 3 Feb 2021 15:11:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3610264F84 for ; Wed, 3 Feb 2021 15:11:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3610264F84 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6FD796B007B; Wed, 3 Feb 2021 10:11:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 687FD6B007D; Wed, 3 Feb 2021 10:11:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54FBC6B007E; Wed, 3 Feb 2021 10:11:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0234.hostedemail.com [216.40.44.234]) by kanga.kvack.org (Postfix) with ESMTP id 31B226B007B for ; Wed, 3 Feb 2021 10:11:04 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id E7E4F3629 for ; Wed, 3 Feb 2021 15:11:02 +0000 (UTC) X-FDA: 77777294406.23.bone07_2e0d205275d4 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin23.hostedemail.com (Postfix) with ESMTP id BA5B337604 for ; Wed, 3 Feb 2021 15:11:02 +0000 (UTC) X-HE-Tag: bone07_2e0d205275d4 X-Filterd-Recvd-Size: 6391 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by imf41.hostedemail.com (Postfix) with ESMTP for ; Wed, 3 Feb 2021 15:11:02 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id m2so5890340wmm.1 for ; Wed, 03 Feb 2021 07:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=euglhQuz1fv7wELuChhUgZYArcEjvEFCsjQV+iKDCRk=; b=J8iayzDTtyfBDDGJUiswl39FT/YSRimMN3Ojh7YVQ3kXYwrQ6wcHBHyN1XlXjPNtMs vLvbNNlwtONnxgluudgL06DJuouLictOkIE4sWcKWK3rDcsxKhTRKD3z1x6PQ3G5TKrV p7Flnyof7dy9PBHUsEMCHPe7nZRS3KmOP6CD6O/+n375Psxd/ENY9onYJUK6eUCe/IC9 nyrUl0jPV8GJsRhylw/mt8i3QYKjGl137tJSB5/5/KSMd+uiLeNgR3QRAkE9jhuLWRaI daUT/gSgJAerAuHcJZFzPLWac6ti1wRFmELN+90Gvyph2KRXUtAeYGH2BtQgQpcVWDms Gx6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=euglhQuz1fv7wELuChhUgZYArcEjvEFCsjQV+iKDCRk=; b=spI+/j527YafHMglcNFJ+aZ09ow9At+tB+0n5GnYMqg3e6psox/sEANURW3/Ti67Gu GYSmL6N4CXs2nu7F78OLnzruIg/UuJJry1xLrn5aqSNHaWMsDjYPSrxIH0DbeJxDT41d BxL1YTywAF5R17tcPuIeW6H2pqw0A+gSf0WY6JEvn2oLQ0xIqPO0vz+w7JmRCGDNhzXA UOCyeUpE4Gh9IUQVGpNclroEHmsE/Te5MH4FXW9jfS9IT0ypsdHWMiGduNX+9BdAirrX JSxpO4rKBT2U8AXNrFBF58WVuN3d6V6+WoMceUgyWXimNzxpCl2FWckc/za/dwATxuI5 LsUg== X-Gm-Message-State: AOAM5323UVRLzp100OKVEmeJ5gttwrppkxdDt3Bre0P/y5fxXDq6DtTh XN8eJE+R2aTlbl/4D3TrpjA7Hw== X-Google-Smtp-Source: ABdhPJwS2nnuxcVBRpnX7RVIStschZE5w8CiM89OOinne9AdFvGcmsEKiY5PVPt0ClY/N/HzKS+Quw== X-Received: by 2002:a1c:107:: with SMTP id 7mr1939842wmb.28.1612365060776; Wed, 03 Feb 2021 07:11:00 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:b1de:c7d:30ce:1840]) by smtp.gmail.com with ESMTPSA id i6sm3730145wrs.71.2021.02.03.07.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 07:10:59 -0800 (PST) Date: Wed, 3 Feb 2021 16:10:53 +0100 From: Marco Elver To: Andrey Konovalov Cc: Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Andrew Morton , Will Deacon , Andrey Ryabinin , Peter Collingbourne , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 07/12] kasan, mm: remove krealloc side-effect Message-ID: References: <884e37ddff31b671725f4d83106111c7dcf8fb9b.1612208222.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <884e37ddff31b671725f4d83106111c7dcf8fb9b.1612208222.git.andreyknvl@google.com> User-Agent: Mutt/2.0.2 (2020-11-20) 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 01, 2021 at 08:43PM +0100, Andrey Konovalov wrote: > Currently, if krealloc() is called on a freed object with KASAN enabled, > it allocates and returns a new object, but doesn't copy any memory from > the old one as ksize() returns 0. This makes a caller believe that > krealloc() succeeded (KASAN report is printed though). > > This patch adds an accessibility check into __do_krealloc(). If the check > fails, krealloc() returns NULL. This check duplicates the one in ksize(); > this is fixed in the following patch. I think "side-effect" is ambiguous, because either way behaviour of krealloc differs from a kernel with KASAN disabled. Something like "kasan, mm: fail krealloc on already freed object" perhaps? > This patch also adds a KASAN-KUnit test to check krealloc() behaviour > when it's called on a freed object. > > Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver > --- > lib/test_kasan.c | 20 ++++++++++++++++++++ > mm/slab_common.c | 3 +++ > 2 files changed, 23 insertions(+) > > diff --git a/lib/test_kasan.c b/lib/test_kasan.c > index 2bb52853f341..61bc894d9f7e 100644 > --- a/lib/test_kasan.c > +++ b/lib/test_kasan.c > @@ -359,6 +359,25 @@ static void krealloc_pagealloc_less_oob(struct kunit *test) > KMALLOC_MAX_CACHE_SIZE + 201); > } > > +/* > + * Check that krealloc() detects a use-after-free, returns NULL, > + * and doesn't unpoison the freed object. > + */ > +static void krealloc_uaf(struct kunit *test) > +{ > + char *ptr1, *ptr2; > + int size1 = 201; > + int size2 = 235; > + > + ptr1 = kmalloc(size1, GFP_KERNEL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ptr1); > + kfree(ptr1); > + > + KUNIT_EXPECT_KASAN_FAIL(test, ptr2 = krealloc(ptr1, size2, GFP_KERNEL)); > + KUNIT_ASSERT_PTR_EQ(test, (void *)ptr2, NULL); > + KUNIT_EXPECT_KASAN_FAIL(test, *(volatile char *)ptr1); > +} > + > static void kmalloc_oob_16(struct kunit *test) > { > struct { > @@ -1056,6 +1075,7 @@ static struct kunit_case kasan_kunit_test_cases[] = { > KUNIT_CASE(krealloc_less_oob), > KUNIT_CASE(krealloc_pagealloc_more_oob), > KUNIT_CASE(krealloc_pagealloc_less_oob), > + KUNIT_CASE(krealloc_uaf), > KUNIT_CASE(kmalloc_oob_16), > KUNIT_CASE(kmalloc_uaf_16), > KUNIT_CASE(kmalloc_oob_in_memset), > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 39d1a8ff9bb8..dad70239b54c 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -1140,6 +1140,9 @@ static __always_inline void *__do_krealloc(const void *p, size_t new_size, > void *ret; > size_t ks; > > + if (likely(!ZERO_OR_NULL_PTR(p)) && !kasan_check_byte(p)) > + return NULL; > + > ks = ksize(p); > > if (ks >= new_size) { > -- > 2.30.0.365.g02bc693789-goog >