From patchwork Tue Apr 21 01:40:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Walter Wu X-Patchwork-Id: 11500201 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 28AC113B2 for ; Tue, 21 Apr 2020 01:40:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D51A22082E for ; Tue, 21 Apr 2020 01:40:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="L20rOhkQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D51A22082E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 16CD78E0005; Mon, 20 Apr 2020 21:40:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 11D8D8E0003; Mon, 20 Apr 2020 21:40:16 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 00C108E0005; Mon, 20 Apr 2020 21:40:15 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0232.hostedemail.com [216.40.44.232]) by kanga.kvack.org (Postfix) with ESMTP id D626C8E0003 for ; Mon, 20 Apr 2020 21:40:15 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 99E09824556B for ; Tue, 21 Apr 2020 01:40:15 +0000 (UTC) X-FDA: 76730156790.06.stone02_1f3ae0084823f X-Spam-Summary: 2,0,0,96fc27da52817a16,d41d8cd98f00b204,walter-zh.wu@mediatek.com,,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1185:1260:1277:1311:1313:1314:1345:1431:1437:1514:1515:1516:1518:1535:1544:1585:1605:1711:1730:1747:1777:1792:1981:2194:2196:2199:2200:2393:2559:2562:2693:2901:3138:3139:3140:3141:3142:3865:3866:3867:3868:3870:3871:4119:4250:4321:4385:5007:6261:6653:7514:8603:10004:11026:11473:11658:11914:12043:12048:12291:12296:12297:12438:12521:12555:12683:12895:13161:13229:14181:14394:14721:21080:21451:21627:21990:30045:30051:30054,0,RBL:210.61.82.183:@mediatek.com:.lbl8.mailshell.net-62.2.12.100 64.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: stone02_1f3ae0084823f X-Filterd-Recvd-Size: 8965 Received: from mailgw01.mediatek.com (unknown [210.61.82.183]) by imf39.hostedemail.com (Postfix) with ESMTP for ; Tue, 21 Apr 2020 01:40:14 +0000 (UTC) X-UUID: f69d6d55cb2f45d897c05192bdd4f3dc-20200421 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=kvJkIFmK0+Fajj8XRCQra0WIBlEJ5d/F7a174u9kVSw=; b=L20rOhkQrm5OIsQ7JG1D0X0FejXBuxj46p0oxGM0IovM9eOanQ6EcQ1hKv2FxtJ5BIxY01+wvIuWmLwMCQO2My/FSRNUWt8sQxZ+tYMk3XaZiaLLBLAMdf8QcNsx1z7qb++B2ZBH/wlwK++uMf6P42qsGprWsWWXYLLqhxXX/Oc=; X-UUID: f69d6d55cb2f45d897c05192bdd4f3dc-20200421 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 2126729325; Tue, 21 Apr 2020 09:40:10 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs06n2.mediatek.inc (172.21.101.130) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 21 Apr 2020 09:40:08 +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; Tue, 21 Apr 2020 09:40:08 +0800 From: Walter Wu To: Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Matthias Brugger , Andrey Konovalov , Andrew Morton CC: , , , , wsd_upstream , , Walter Wu Subject: [PATCH] kasan: fix KASAN unit tests for tag-based KASAN Date: Tue, 21 Apr 2020 09:40:07 +0800 Message-ID: <20200421014007.6012-1-walter-zh.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-TM-SNTS-SMTP: 2CEDE98B7C8540AA4DB9C008FB938823D9E9F478584B868D577067E8D6D705122000:8 X-MTK: N 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: When we use tag-based KASAN, then KASAN unit tests don't detect out-of-bounds memory access. Because 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 of pointer, then 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 --- lib/test_kasan.c | 62 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index e3087d90e00d..a164f6b47fe5 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -40,7 +40,12 @@ static noinline void __init kmalloc_oob_right(void) return; } +#ifdef CONFIG_KASAN_GENERIC ptr[size] = 'x'; +#else + ptr[size + 5] = 'x'; +#endif + kfree(ptr); } @@ -92,7 +97,12 @@ static noinline void __init kmalloc_pagealloc_oob_right(void) return; } +#ifdef CONFIG_KASAN_GENERIC ptr[size] = 0; +#else + ptr[size + 6] = 0; +#endif + kfree(ptr); } @@ -162,7 +172,11 @@ static noinline void __init kmalloc_oob_krealloc_more(void) return; } +#ifdef CONFIG_KASAN_GENERIC ptr2[size2] = 'x'; +#else + ptr2[size2 + 13] = 'x'; +#endif kfree(ptr2); } @@ -180,7 +194,12 @@ static noinline void __init kmalloc_oob_krealloc_less(void) kfree(ptr1); return; } + +#ifdef CONFIG_KASAN_GENERIC ptr2[size2] = 'x'; +#else + ptr2[size2 + 2] = 'x'; +#endif kfree(ptr2); } @@ -216,7 +235,11 @@ static noinline void __init kmalloc_oob_memset_2(void) return; } +#ifdef CONFIG_KASAN_GENERIC memset(ptr+7, 0, 2); +#else + memset(ptr+15, 0, 2); +#endif kfree(ptr); } @@ -232,7 +255,11 @@ static noinline void __init kmalloc_oob_memset_4(void) return; } +#ifdef CONFIG_KASAN_GENERIC memset(ptr+5, 0, 4); +#else + memset(ptr+15, 0, 4); +#endif kfree(ptr); } @@ -249,7 +276,11 @@ static noinline void __init kmalloc_oob_memset_8(void) return; } +#ifdef CONFIG_KASAN_GENERIC memset(ptr+1, 0, 8); +#else + memset(ptr+15, 0, 8); +#endif kfree(ptr); } @@ -265,7 +296,11 @@ static noinline void __init kmalloc_oob_memset_16(void) return; } +#ifdef CONFIG_KASAN_GENERIC memset(ptr+1, 0, 16); +#else + memset(ptr+15, 0, 16); +#endif kfree(ptr); } @@ -281,7 +316,11 @@ static noinline void __init kmalloc_oob_in_memset(void) return; } +#ifdef CONFIG_KASAN_GENERIC memset(ptr, 0, size+5); +#else + memset(ptr, 0, size+7); +#endif kfree(ptr); } @@ -415,7 +454,11 @@ static noinline void __init kmem_cache_oob(void) return; } +#ifdef CONFIG_KASAN_GENERIC *p = p[size]; +#else + *p = p[size + 8]; +#endif kmem_cache_free(cache, p); kmem_cache_destroy(cache); } @@ -497,6 +540,11 @@ static noinline void __init copy_user_test(void) char __user *usermem; size_t size = 10; int unused; +#ifdef CONFIG_KASAN_GENERIC + size_t oob_size = 1; +#else + size_t oob_size = 7; +#endif kmem = kmalloc(size, GFP_KERNEL); if (!kmem) @@ -512,25 +560,25 @@ static noinline void __init copy_user_test(void) } 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);