From patchwork Mon Jul 6 02:21:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Walter Wu X-Patchwork-Id: 11644823 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 58C11913 for ; Mon, 6 Jul 2020 02:23:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3216F2070C for ; Mon, 6 Jul 2020 02:23:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KAWGftMy"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="jouIo6bW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3216F2070C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=GQgyH4tEzY8KCzCdL1mUNHN1gZEHL3VznkP07ThTA58=; b=KAWGftMyWFgi/iETZPQqy9r02s sZZ5wMOhfKNILfRryjXfI1Pec+1+Ql5sc0afLii6PSJ+BSA9mvQ4g8+Un1lvaIxqBE0o7SFiHEQR2 Yv/fUY2VMk5kxCGna1uEtxn1x/mAr8IKE3YzL0HAmsy6//2YHzHsrWHYkRceBwWp//d3D8AYW/SC7 YxwI9QiCRWoRt1pMa+oTXxmHNZTjaQ6AmV7bj+dpqAbbhkVMLuQtiqPFRqdGfBp6oodi08D/ijARV wJoTpc8G6tBvl6p9r/oMitURJ4D/eiKIaluINLEO2u91YqLiICZGBWShbsUVN5ZOCKY4x9wPPTKBE rWpJKJJw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsGlk-0005fE-DG; Mon, 06 Jul 2020 02:22:08 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsGlg-0005eG-IT; Mon, 06 Jul 2020 02:22:06 +0000 X-UUID: 7f8b40fa094147ab83f4993552e7cb54-20200705 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=SiWDphWYGnavflkljTLom2j3mHnFMDqK/JoyQBPF1o4=; b=jouIo6bW2xrjquA3OK2ZX/C1mn8AeTPPLzt6GGIDaMA4oOrwEWe7GkQBbNOy2FP/WfG6VJsdWL+PGX3Ns6q62k34ZNRLUBPWv0bxtjMUAlyGnfNQJNnT6F4qx5b4/zaiJd+80Z621aFhcRKhpi67HrCNmDMk3xMPZxWTxPAVh7Q=; X-UUID: 7f8b40fa094147ab83f4993552e7cb54-20200705 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1006468363; Sun, 05 Jul 2020 18:21:59 -0800 Received: from MTKMBS06N1.mediatek.inc (172.21.101.129) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 5 Jul 2020 19:21:52 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs06n1.mediatek.inc (172.21.101.129) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 6 Jul 2020 10:21:50 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 6 Jul 2020 10:21:52 +0800 From: Walter Wu To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Matthias Brugger Subject: [PATCH v2] kasan: fix KASAN unit tests for tag-based KASAN Date: Mon, 6 Jul 2020 10:21:50 +0800 Message-ID: <20200706022150.20848-1-walter-zh.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200705_222204_761339_4EAC03C7 X-CRM114-Status: GOOD ( 12.19 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Walter Wu , wsd_upstream , Andrey Konovalov , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-mediatek@lists.infradead.org, Andrew Morton , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We use tag-based KASAN, then KASAN unit tests don't detect out-of-bounds memory access. They need to be fixed. With tag-based KASAN, the state of each 16 aligned bytes of memory is encoded in one shadow byte and the shadow value is tag of pointer, so we need to read next shadow byte, the shadow value is not equal to tag value of pointer, so that tag-based KASAN will detect out-of-bounds memory access. Signed-off-by: Walter Wu Cc: Andrey Ryabinin Cc: Dmitry Vyukov Cc: Alexander Potapenko Cc: Matthias Brugger Cc: Andrey Konovalov Cc: Andrew Morton --- changes since v1: - Reduce amount of non-compiled code. - KUnit-KASAN Integration patchset are not merged yet. My patch should have conflict with it, if needed, we can continue to wait it. --- lib/test_kasan.c | 81 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 17 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index e3087d90e00d..660664439d52 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -40,7 +40,11 @@ static noinline void __init kmalloc_oob_right(void) return; } - ptr[size] = 'x'; + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + ptr[size] = 'x'; + else + ptr[size + 5] = 'x'; + kfree(ptr); } @@ -92,7 +96,11 @@ static noinline void __init kmalloc_pagealloc_oob_right(void) return; } - ptr[size] = 0; + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + ptr[size] = 0; + else + ptr[size + 6] = 0; + kfree(ptr); } @@ -162,7 +170,11 @@ static noinline void __init kmalloc_oob_krealloc_more(void) return; } - ptr2[size2] = 'x'; + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + ptr2[size2] = 'x'; + else + ptr2[size2 + 13] = 'x'; + kfree(ptr2); } @@ -180,7 +192,12 @@ static noinline void __init kmalloc_oob_krealloc_less(void) kfree(ptr1); return; } - ptr2[size2] = 'x'; + + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + ptr2[size2] = 'x'; + else + ptr2[size2 + 2] = 'x'; + kfree(ptr2); } @@ -216,7 +233,11 @@ static noinline void __init kmalloc_oob_memset_2(void) return; } - memset(ptr+7, 0, 2); + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + memset(ptr+7, 0, 2); + else + memset(ptr+15, 0, 2); + kfree(ptr); } @@ -232,7 +253,11 @@ static noinline void __init kmalloc_oob_memset_4(void) return; } - memset(ptr+5, 0, 4); + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + memset(ptr+5, 0, 4); + else + memset(ptr+15, 0, 4); + kfree(ptr); } @@ -249,7 +274,11 @@ static noinline void __init kmalloc_oob_memset_8(void) return; } - memset(ptr+1, 0, 8); + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + memset(ptr+1, 0, 8); + else + memset(ptr+15, 0, 8); + kfree(ptr); } @@ -265,7 +294,11 @@ static noinline void __init kmalloc_oob_memset_16(void) return; } - memset(ptr+1, 0, 16); + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + memset(ptr+1, 0, 16); + else + memset(ptr+15, 0, 16); + kfree(ptr); } @@ -281,7 +314,11 @@ static noinline void __init kmalloc_oob_in_memset(void) return; } - memset(ptr, 0, size+5); + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + memset(ptr, 0, size+5); + else + memset(ptr, 0, size+7); + kfree(ptr); } @@ -415,7 +452,11 @@ static noinline void __init kmem_cache_oob(void) return; } - *p = p[size]; + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + *p = p[size]; + else + *p = p[size + 8]; + kmem_cache_free(cache, p); kmem_cache_destroy(cache); } @@ -497,6 +538,7 @@ static noinline void __init copy_user_test(void) char __user *usermem; size_t size = 10; int unused; + size_t oob_size; kmem = kmalloc(size, GFP_KERNEL); if (!kmem) @@ -511,26 +553,31 @@ static noinline void __init copy_user_test(void) return; } + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) + oob_size = 1; + else + oob_size = 7; + pr_info("out-of-bounds in copy_from_user()\n"); - unused = copy_from_user(kmem, usermem, size + 1); + unused = copy_from_user(kmem, usermem, size + oob_size); pr_info("out-of-bounds in copy_to_user()\n"); - unused = copy_to_user(usermem, kmem, size + 1); + unused = copy_to_user(usermem, kmem, size + oob_size); pr_info("out-of-bounds in __copy_from_user()\n"); - unused = __copy_from_user(kmem, usermem, size + 1); + unused = __copy_from_user(kmem, usermem, size + oob_size); pr_info("out-of-bounds in __copy_to_user()\n"); - unused = __copy_to_user(usermem, kmem, size + 1); + unused = __copy_to_user(usermem, kmem, size + oob_size); pr_info("out-of-bounds in __copy_from_user_inatomic()\n"); - unused = __copy_from_user_inatomic(kmem, usermem, size + 1); + unused = __copy_from_user_inatomic(kmem, usermem, size + oob_size); pr_info("out-of-bounds in __copy_to_user_inatomic()\n"); - unused = __copy_to_user_inatomic(usermem, kmem, size + 1); + unused = __copy_to_user_inatomic(usermem, kmem, size + oob_size); pr_info("out-of-bounds in strncpy_from_user()\n"); - unused = strncpy_from_user(kmem, usermem, size + 1); + unused = strncpy_from_user(kmem, usermem, size + oob_size); vm_munmap((unsigned long)usermem, PAGE_SIZE); kfree(kmem);