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=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 37122C433E0 for ; Sun, 3 Jan 2021 13:56:35 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CC36520C56 for ; Sun, 3 Jan 2021 13:56:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CC36520C56 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BEAC36B0103; Sun, 3 Jan 2021 08:56:33 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B9AB76B0108; Sun, 3 Jan 2021 08:56:33 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB1F86B010A; Sun, 3 Jan 2021 08:56:33 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0092.hostedemail.com [216.40.44.92]) by kanga.kvack.org (Postfix) with ESMTP id 979A66B0103 for ; Sun, 3 Jan 2021 08:56:33 -0500 (EST) Received: from smtpin19.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 5994D1EE6 for ; Sun, 3 Jan 2021 13:56:33 +0000 (UTC) X-FDA: 77664613866.19.edge26_32022ee274c8 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin19.hostedemail.com (Postfix) with ESMTP id 3289C1AD31E for ; Sun, 3 Jan 2021 13:56:33 +0000 (UTC) X-HE-Tag: edge26_32022ee274c8 X-Filterd-Recvd-Size: 5826 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Sun, 3 Jan 2021 13:56:32 +0000 (UTC) Received: by mail-pf1-f177.google.com with SMTP id c79so14743593pfc.2 for ; Sun, 03 Jan 2021 05:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OkmIEGZrUYxTikbU8Yd5Ez0Y/58b3wmDmzrHUQ/JMJM=; b=nGjvjcmdsFlkfDjdvxxYRqohrXCuqaKdYCNjBP1AJYFGuN8bT0krRV+4Nnzp+QG9RN iABSwavXnFmlBX2apMYrgTZORFtYaKMlKI6y/uz5KdMGKDxdf9Z29rHQYAiLDOOjEm+K G9zIyW0Fq9CkTvOltoikIB8nRZCo4DJVh9j3OL8VeDnm9GgS4b2P4GOXQ9wqA54oXuv4 HA5lHIMg72vc7Wswx8uy9HG8RRAQrVywRjP02mc6fG7JgWj+QJh8y7erpzdN3HJCGvaf 5MzI1FW8qzWfkNNCcjH4dTluJzs9wIipgT4mb6YbFQuHBjXD/o1wFLAGUGKqSUj5BsF6 Ni5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OkmIEGZrUYxTikbU8Yd5Ez0Y/58b3wmDmzrHUQ/JMJM=; b=oLmx9NZIXt84QqUOInfbpS3dwqOOkfsAxmiyOkkTqklNRPxJjo7HuiBV/vFkQPSlni cEg/Cg460bsA8tr/RkQD1SqJCJmvLm3ESRKCHaYkdq46Z3XY/+aUhy48fqryjqJm0ZtS H8JgfkR08abBtELh6RcBsd7eMuWF09m6BJ8Tcz3kjB4aTGr9Wvk5a+uDb5lMP0AxtibA fXc3P8fCGBGOFudBO8II3oS5zipkA1Ag5hmXgFP0Pym16LyHc1Iclt6m2AJVfmQ13GLq Uhcb72gIp8plG35V2HegU/AHfzY74YDG39OSBz/sUwNzwANKAfbAYDI9F7Iczeabvo3C qyXA== X-Gm-Message-State: AOAM531ZHh+478Wtr6vNPFd5nn5do1E6dclfjZST/tDWq2/KCn3aH9Bt ztVg17KT6lSRSEX6Uu65Gp0= X-Google-Smtp-Source: ABdhPJxW8b/T9Mjgg0bCBSsDDs05greg1V5BdrxjsF8j/i2UplKH6ZyUEqMxWXlFrLFHRQKRV7Q91Q== X-Received: by 2002:a62:ea17:0:b029:1ad:4788:7815 with SMTP id t23-20020a62ea170000b02901ad47887815mr55124711pfh.1.1609682191812; Sun, 03 Jan 2021 05:56:31 -0800 (PST) Received: from localhost.localdomain (61-230-37-4.dynamic-ip.hinet.net. [61.230.37.4]) by smtp.gmail.com with ESMTPSA id u12sm25928427pgi.91.2021.01.03.05.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 05:56:31 -0800 (PST) From: Lecopzer Chen To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, kasan-dev@googlegroups.com Cc: dan.j.williams@intel.com, aryabinin@virtuozzo.com, glider@google.com, dvyukov@google.com, akpm@linux-foundation.org, linux-mediatek@lists.infradead.org, yj.chiang@mediatek.com, Lecopzer Chen , Lecopzer Chen Subject: [PATCH] kasan: fix unaligned address is unhandled in kasan_remove_zero_shadow Date: Sun, 3 Jan 2021 21:56:21 +0800 Message-Id: <20210103135621.83129-1-lecopzer@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: During testing kasan_populate_early_shadow and kasan_remove_zero_shadow, if the shadow start and end address in kasan_remove_zero_shadow() is not aligned to PMD_SIZE, the remain unaligned PTE won't be removed. In the test case for kasan_remove_zero_shadow(): shadow_start: 0xffffffb802000000, shadow end: 0xffffffbfbe000000 3-level page table: PUD_SIZE: 0x40000000 PMD_SIZE: 0x200000 PAGE_SIZE: 4K 0xffffffbf80000000 ~ 0xffffffbfbdf80000 will not be removed because in kasan_remove_pud_table(), kasan_pmd_table(*pud) is true but the next address is 0xffffffbfbdf80000 which is not aligned to PUD_SIZE. In the correct condition, this should fallback to the next level kasan_remove_pmd_table() but the condition flow always continue to skip the unaligned part. Fix by correcting the condition when next and addr are neither aligned. Fixes: 0207df4fa1a86 ("kernel/memremap, kasan: make ZONE_DEVICE with work= with KASAN") Signed-off-by: Lecopzer Chen --- mm/kasan/init.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mm/kasan/init.c b/mm/kasan/init.c index 67051cfae41c..ae9158f7501f 100644 --- a/mm/kasan/init.c +++ b/mm/kasan/init.c @@ -372,9 +372,10 @@ static void kasan_remove_pmd_table(pmd_t *pmd, unsig= ned long addr, =20 if (kasan_pte_table(*pmd)) { if (IS_ALIGNED(addr, PMD_SIZE) && - IS_ALIGNED(next, PMD_SIZE)) + IS_ALIGNED(next, PMD_SIZE)) { pmd_clear(pmd); - continue; + continue; + } } pte =3D pte_offset_kernel(pmd, addr); kasan_remove_pte_table(pte, addr, next); @@ -397,9 +398,10 @@ static void kasan_remove_pud_table(pud_t *pud, unsig= ned long addr, =20 if (kasan_pmd_table(*pud)) { if (IS_ALIGNED(addr, PUD_SIZE) && - IS_ALIGNED(next, PUD_SIZE)) + IS_ALIGNED(next, PUD_SIZE)) { pud_clear(pud); - continue; + continue; + } } pmd =3D pmd_offset(pud, addr); pmd_base =3D pmd_offset(pud, 0); @@ -423,9 +425,10 @@ static void kasan_remove_p4d_table(p4d_t *p4d, unsig= ned long addr, =20 if (kasan_pud_table(*p4d)) { if (IS_ALIGNED(addr, P4D_SIZE) && - IS_ALIGNED(next, P4D_SIZE)) + IS_ALIGNED(next, P4D_SIZE)) { p4d_clear(p4d); - continue; + continue; + } } pud =3D pud_offset(p4d, addr); kasan_remove_pud_table(pud, addr, next); @@ -456,9 +459,10 @@ void kasan_remove_zero_shadow(void *start, unsigned = long size) =20 if (kasan_p4d_table(*pgd)) { if (IS_ALIGNED(addr, PGDIR_SIZE) && - IS_ALIGNED(next, PGDIR_SIZE)) + IS_ALIGNED(next, PGDIR_SIZE)) { pgd_clear(pgd); - continue; + continue; + } } =20 p4d =3D p4d_offset(pgd, addr); --=20 2.25.1