From patchwork Mon Feb 1 19:43:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 12059903 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 A10E7C433DB for ; Mon, 1 Feb 2021 19:44:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4879F64EA8 for ; Mon, 1 Feb 2021 19:44:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4879F64EA8 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 9EDB16B0089; Mon, 1 Feb 2021 14:43:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 94E5D6B008A; Mon, 1 Feb 2021 14:43:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 759A16B008C; Mon, 1 Feb 2021 14:43:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id 557B06B0089 for ; Mon, 1 Feb 2021 14:43:58 -0500 (EST) Received: from smtpin05.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 1CED28249980 for ; Mon, 1 Feb 2021 19:43:58 +0000 (UTC) X-FDA: 77770724556.05.knee31_2513d47275c4 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin05.hostedemail.com (Postfix) with ESMTP id EFDE81802BC8B for ; Mon, 1 Feb 2021 19:43:57 +0000 (UTC) X-HE-Tag: knee31_2513d47275c4 X-Filterd-Recvd-Size: 5730 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) by imf27.hostedemail.com (Postfix) with ESMTP for ; Mon, 1 Feb 2021 19:43:57 +0000 (UTC) Received: by mail-wm1-f73.google.com with SMTP id z25so394520wml.0 for ; Mon, 01 Feb 2021 11:43:57 -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=yMQgrLxhHIKq4G0a2NCbXbKyDrvusdwY4yeazjCtuyk=; b=ivESTfLfXADjygdQiFNXCX+wPXeMmmyDL7MhSMwYXQFbjxX6om64VWAa9DB0UHgjky FA0IkQ9/NQQQM1j6Es5XovdS1v0MO0KZldXf+YBmCCZn47B20vO09U3YN5ZVtPh9slfU V0695NxHTqBxob7ObPmJFRiD3DbtZI77vvKRyogyBNt+B0g1mlTTZfcvclio6T9srFgt DeT+ymo2vjail6bFhgkunaozgr3fW+qjwQ7TMJkpHXXpDU0/3qtwo9c7+nWPQ+JBZxK0 m6EaK0Hm5acOgUfe9nl3oqyOCXvObbHtXRzj+nbFuJQYf48336Ff8i+FpKXIIffMt9oQ NOjQ== 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=yMQgrLxhHIKq4G0a2NCbXbKyDrvusdwY4yeazjCtuyk=; b=hZOTe/p3IA4VpLnRugB1xbFFe+JaWTudZoLDqlOh+HIj0mwek3/VcYZxgIhfmaxLyT RiVGeysi+gjAB7Eyvw9RxbMGkL9r13MhWgjghPRcrV3ca7Owd/JsGo26eIIXj8pf8lz1 0CjXJQR8utvCfTqTZ9wVCiW3CZzI1yoeCusVyuRX1IQSh40XRDtJg0n/kTYL1gqyiJJF Svw2hTi7EH0mPO9uMpiSoQny3x3Jn4/Atl9nEqOhpWadt8bMfGcNKNxlQa8m2wqYIN2T yRq4vwsNm8HCSVqyXoZfI9s6YW90OXl9iDwVeplhaG+I+YRwECrPcFyHsXL+W+yF3tEx mr0w== X-Gm-Message-State: AOAM533Br9052f6q/Bfy1+pJXiPhuKJrvERLVclVwZyIvsJzUJx98trf C42yIU+OQZ1je7Igw6rj681TG9S/7OCIXywy X-Google-Smtp-Source: ABdhPJzOa+LccFfH9kBnsOeOGuqeG8GyRvo7cSnKb8yeZh67FwLtjenT5WmmmRbIZ1nG1AOskfgvEC22yE1+sKw/ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:7711:: with SMTP id t17mr441041wmi.64.1612208636543; Mon, 01 Feb 2021 11:43:56 -0800 (PST) Date: Mon, 1 Feb 2021 20:43:31 +0100 In-Reply-To: Message-Id: <884e37ddff31b671725f4d83106111c7dcf8fb9b.1612208222.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH 07/12] kasan, mm: remove krealloc side-effect From: Andrey Konovalov To: Catalin Marinas , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: 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, 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 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. 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) {