From patchwork Fri Feb 5 17:34:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12070559 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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 DB7D0C433E0 for ; Fri, 5 Feb 2021 17:35:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 72BD76500B for ; Fri, 5 Feb 2021 17:35:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 72BD76500B 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 E4CB36B0082; Fri, 5 Feb 2021 12:35:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DFF5C8D0002; Fri, 5 Feb 2021 12:35:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEAC36B0085; Fri, 5 Feb 2021 12:35:09 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0071.hostedemail.com [216.40.44.71]) by kanga.kvack.org (Postfix) with ESMTP id AFD716B0082 for ; Fri, 5 Feb 2021 12:35:09 -0500 (EST) Received: from smtpin14.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 723A33635 for ; Fri, 5 Feb 2021 17:35:09 +0000 (UTC) X-FDA: 77784915138.14.quilt70_491255f275e6 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin14.hostedemail.com (Postfix) with ESMTP id 50B5918229818 for ; Fri, 5 Feb 2021 17:35:09 +0000 (UTC) X-HE-Tag: quilt70_491255f275e6 X-Filterd-Recvd-Size: 5793 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf14.hostedemail.com (Postfix) with ESMTP for ; Fri, 5 Feb 2021 17:35:08 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id b62so4082888wmc.5 for ; Fri, 05 Feb 2021 09:35:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=6RV3PXvNWDRRLwJfhc9nA9uOtjOO4vRR2YJTlHhgy1g=; b=hr9DzLw8PMFXDmOtc8ZAyVLRhSu9H1GXAWRc7Isd9/XTI8Cgi/jOQVN1GFDvZnERyB G0HDSX6x8jQqkjNbE1UygZ3nJdUqxCSAPKSLVU27KQJjuRq2fa0ClujER0+PhSTzUcbZ nrhIBgxy8C9/vLXSIHaHysZ86Cf8ZxwaoECfAGez4vWWEVDoSH037sAnwgHeL68Yg5iV FjqojbgDKu9rTiWhHFSCGcCAnibfMdcmw/QUZF+vozj8e9iaXiBtzMtFGaPsuvLT80Kw 2VNm/yfw0oadQd2OIkqOcJCfOagcSL+70vJBOSCrH8Uczn7HUXpEpK1ijgH8yi9KwdHb prUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=6RV3PXvNWDRRLwJfhc9nA9uOtjOO4vRR2YJTlHhgy1g=; b=MLFvlBlHuFqYKS2Gy49JKQ9PwkK4CioWyVMKh8ea9MDLn90uBe3vwSw/CKQJ5B9ccm v+KeLX6Ocjujm9Fjam7H+NDsBDtqVik1sgjVOJX7k+0vnYAh8F1AKQn1/SiTC3dXeZBi 4X4/v6itNCk34lWX/xmePtp56Sgad+A5vsAQTectTNlF77bEfRXMx2KMe3ZiNKr6CsnG 4//NkgOLecIAPGg6k85POdlIVc8PPI1bCvlO7yDPMMiA5OF17beKuGqb9PzdlwrE9FDP qG2BDKXiFKjASYnhRBBdU6BtOjnSt1FToxVsEANP2Hi4KMaAepPGq99En8cK7tqX1l+r C2iQ== X-Gm-Message-State: AOAM530aPk7RRIyhSN7BM/ITlkHGjBKHgJXhCW6Emx44ZqXqSeSc19y1 F+CnuQSydGvpipjUIGIhKnFoQz/NgAPyJvhX X-Google-Smtp-Source: ABdhPJytRzXE5voKMAWTVE7tb2OGC2+Y1oliS+AIv9OdSPsqoc+dVJE3s1RRE+LkSF8dIUprMqGcmE4wi/aHTTwX X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:edb8:b79c:2e20:e531]) (user=andreyknvl job=sendgmr) by 2002:a1c:3185:: with SMTP id x127mr4375625wmx.117.1612546507585; Fri, 05 Feb 2021 09:35:07 -0800 (PST) Date: Fri, 5 Feb 2021 18:34:41 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v3 mm 07/13] kasan, mm: fail krealloc on freed objects From: Andrey Konovalov To: Andrew Morton , Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: 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, Andrey Konovalov 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: 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 the 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. This patch also adds a KASAN-KUnit test to check krealloc() behaviour when it's called on a freed object. Reviewed-by: Marco Elver Signed-off-by: Andrey Konovalov --- 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 ffebad2f0e6e..1328c468fdb5 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -353,6 +353,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 { @@ -1050,6 +1069,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) {