From patchwork Fri Aug 17 08:37:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyeongdon Kim X-Patchwork-Id: 10568525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55BCA139A for ; Fri, 17 Aug 2018 08:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F8582AF7A for ; Fri, 17 Aug 2018 08:38:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 338B52AFB5; Fri, 17 Aug 2018 08:38:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E27842AF7A for ; Fri, 17 Aug 2018 08:38:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B18426B074F; Fri, 17 Aug 2018 04:38:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AC75D6B0750; Fri, 17 Aug 2018 04:38:07 -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 9B64D6B0751; Fri, 17 Aug 2018 04:38:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id 58EE16B074F for ; Fri, 17 Aug 2018 04:38:07 -0400 (EDT) Received: by mail-pf1-f197.google.com with SMTP id p5-v6so3331377pfh.11 for ; Fri, 17 Aug 2018 01:38:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id; bh=YTmGsD6t3z/0IpGSSfmG4tzF5ye9uErfw8ev2eLqPaE=; b=CMBlRLU9ar9BXB2yKbYAfEkZZGs3Fo6ZiWJetGvzZfEDX2Um6K4HouMIScBJYilW1d TWEr0gBzu5mgSwAWQgGXJbL/7vQIRY4+7JKVJOVvd44MIPiF/q5IDMTmY69E9EclHDR0 2d4DQThdVXfAGLm5qVJ2LSIeq/xSU0upD+APk58sBF0V1Klf4mewAHk04EkJVExycASk fXnhRSAPd6CMBpipK/E96cj5igNy3cKC1+lLhY6RmqerIhhr9hd8qzrGD/3a/NjbPA4t qb/6pcw2EZWESoGgE9uY0zVn5n7Uckn+Rawl3vmnVrCbtzDIO7ja4nSaHoTYBP4f1Jsh CroA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of kyeongdon.kim@lge.com designates 156.147.23.51 as permitted sender) smtp.mailfrom=kyeongdon.kim@lge.com X-Gm-Message-State: AOUpUlEzkOtIeQwcYtaZjZh1PjcljWUh3XBiuXKp4aN/zs+HJYRfWHuo usUw8nkSSDQ2H7PMPYO/TJqG0UAPyd2gX51KSXdbshSXhe6svjR0v/DXj+hD9itbVVniHyGGMiI tBBvppehiV8BJ160QjGycvJB8vnCS5jnDLvz5k9v09O7Wn7Aptj+vxurVEoRbKpELWQ== X-Received: by 2002:a63:d645:: with SMTP id d5-v6mr32788672pgj.450.1534495086997; Fri, 17 Aug 2018 01:38:06 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyxq+UsOhrHFqrJB1289EryApAdNy59fL963UlpE7tQEES7jy4Ss8dl1D6bKlovZ+UQ9Ivw X-Received: by 2002:a63:d645:: with SMTP id d5-v6mr32788614pgj.450.1534495086066; Fri, 17 Aug 2018 01:38:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534495086; cv=none; d=google.com; s=arc-20160816; b=0qaqyAyYgmg5mydeyFsLfRKFTXI0BaPOOqLiRGxLhpvN3x6cWOJbH3lgKwS/VRDjWZ f+o81zjYfU7AuVJev12Jxo2ZZn3z+XJwNRg8sbwuPI99SXLefHdgqrPiTeBHU9Bib4H8 i6UldHFmy3W+9PjNgZaAZQkxsbGTP9TQ43oa8uIXX0ATA29EAuXSMKiTaybZwo8WamFE 300JVGX44pBBV3Jr/phP0HR6H0ws+s6bj6Wd6BCb3OJsyF7YNja7HIZp4wWZ+Qq8Im1K /ronL6ynT3LSsDsxIEaQle9wSv3j4RNGOSrgnORQ+r8av25CkknyvBEIMvvuAuLwl9SK LV+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=YTmGsD6t3z/0IpGSSfmG4tzF5ye9uErfw8ev2eLqPaE=; b=wvDTG+wY4Cn2U7O6cpgZamS/RZyry2q/ySxKCIv+kHZJhNKE0rllP9pdNTFBnRSoyh ak0VbNNTdGXGeV9Mm4M332tajTq+thLiGylyh4hO7NA/Ws2s5gZURMfmGNAztS2wUjHs JzEB4w31OVTgxAwavvSSoCVJYuNBniFTeAoDBexDy6yj7digkCjeBwGBRx8+ymjBlBcp jddY4Q/2GgPpHh6OXt74qOLQSP4/XYOxyRnYF9Il9SU4E9o3vPnN9K29eHdBbwN7f2Jb FjCOeGOLXpMoWON2WynSpxaD707Od2SQL/ntnHTpHYOlHfTLeYOzQ/o+qHFj8H9OcXpt xwEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of kyeongdon.kim@lge.com designates 156.147.23.51 as permitted sender) smtp.mailfrom=kyeongdon.kim@lge.com Received: from lgeamrelo11.lge.com (lgeamrelo11.lge.com. [156.147.23.51]) by mx.google.com with ESMTP id c18-v6si1543322pgh.530.2018.08.17.01.38.05 for ; Fri, 17 Aug 2018 01:38:06 -0700 (PDT) Received-SPF: pass (google.com: domain of kyeongdon.kim@lge.com designates 156.147.23.51 as permitted sender) client-ip=156.147.23.51; Authentication-Results: mx.google.com; spf=pass (google.com: domain of kyeongdon.kim@lge.com designates 156.147.23.51 as permitted sender) smtp.mailfrom=kyeongdon.kim@lge.com Received: from unknown (HELO lgeamrelo02.lge.com) (156.147.1.126) by 156.147.23.51 with ESMTP; 17 Aug 2018 17:38:04 +0900 X-Original-SENDERIP: 156.147.1.126 X-Original-MAILFROM: kyeongdon.kim@lge.com Received: from unknown (HELO localhost.localdomain) (10.168.176.142) by 156.147.1.126 with ESMTP; 17 Aug 2018 17:38:03 +0900 X-Original-SENDERIP: 10.168.176.142 X-Original-MAILFROM: kyeongdon.kim@lge.com From: Kyeongdon Kim To: aryabinin@virtuozzo.com, catalin.marinas@arm.com, will.deacon@arm.com, glider@google.com, dvyukov@google.com Cc: Jason@zx2c4.com, robh@kernel.org, ard.biesheuvel@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, kyeongdon.kim@lge.com Subject: [PATCH] arm64: kasan: add interceptors for strcmp/strncmp functions Date: Fri, 17 Aug 2018 17:37:55 +0900 Message-Id: <1534495075-82167-1-git-send-email-kyeongdon.kim@lge.com> X-Mailer: git-send-email 2.6.2 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: X-Virus-Scanned: ClamAV using ClamSMTP This patch declares strcmp/strncmp as weak symbols. (2 of them are the most used string operations) Original functions declared as weak symbols and strong ones in mm/kasan/kasan.c could replace them. Assembly optimized strcmp/strncmp functions cannot detect KASan bug. But, now we can detect them. ================================================================== BUG: KASAN: use-after-free in platform_match+0x1c/0x5c at addr ffffffc0ad313500 Read of size 1 by task swapper/0/1 CPU: 3 PID: 1 Comm: swapper/0 Tainted: G B 4.9.77+ #1 Hardware name: Generic (DT) based system Call trace: dump_backtrace+0x0/0x2e0 show_stack+0x14/0x1c dump_stack+0x88/0xb0 kasan_object_err+0x24/0x7c kasan_report+0x2f0/0x484 check_memory_region+0x20/0x14c strcmp+0x1c/0x5c platform_match+0x40/0xe4 __driver_attach+0x40/0x130 bus_for_each_dev+0xc4/0xe0 driver_attach+0x30/0x3c bus_add_driver+0x2dc/0x328 driver_register+0x118/0x160 __platform_driver_register+0x7c/0x88 alarmtimer_init+0x154/0x1e4 do_one_initcall+0x184/0x1a4 kernel_init_freeable+0x2ec/0x2f0 kernel_init+0x18/0x10c ret_from_fork+0x10/0x50 Signed-off-by: Kyeongdon Kim --- arch/arm64/include/asm/string.h | 4 ++++ arch/arm64/kernel/arm64ksyms.c | 2 ++ arch/arm64/kernel/image.h | 2 ++ arch/arm64/lib/strcmp.S | 3 +++ arch/arm64/lib/strncmp.S | 3 +++ mm/kasan/kasan.c | 15 +++++++++++++++ 6 files changed, 29 insertions(+) diff --git a/arch/arm64/include/asm/string.h b/arch/arm64/include/asm/string.h index dd95d33..d546605 100644 --- a/arch/arm64/include/asm/string.h +++ b/arch/arm64/include/asm/string.h @@ -24,9 +24,11 @@ extern char *strchr(const char *, int c); #define __HAVE_ARCH_STRCMP extern int strcmp(const char *, const char *); +extern int __strcmp(const char *, const char *); #define __HAVE_ARCH_STRNCMP extern int strncmp(const char *, const char *, __kernel_size_t); +extern int __strncmp(const char *, const char *, __kernel_size_t); #define __HAVE_ARCH_STRLEN extern __kernel_size_t strlen(const char *); @@ -67,6 +69,8 @@ void memcpy_flushcache(void *dst, const void *src, size_t cnt); #define memcpy(dst, src, len) __memcpy(dst, src, len) #define memmove(dst, src, len) __memmove(dst, src, len) #define memset(s, c, n) __memset(s, c, n) +#define strcmp(cs, ct) __strcmp(cs, ct) +#define strncmp(cs, ct, n) __strncmp(cs, ct, n) #ifndef __NO_FORTIFY #define __NO_FORTIFY /* FORTIFY_SOURCE uses __builtin_memcpy, etc. */ diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c index d894a20..10b1164 100644 --- a/arch/arm64/kernel/arm64ksyms.c +++ b/arch/arm64/kernel/arm64ksyms.c @@ -50,6 +50,8 @@ EXPORT_SYMBOL(strcmp); EXPORT_SYMBOL(strncmp); EXPORT_SYMBOL(strlen); EXPORT_SYMBOL(strnlen); +EXPORT_SYMBOL(__strcmp); +EXPORT_SYMBOL(__strncmp); EXPORT_SYMBOL(memset); EXPORT_SYMBOL(memcpy); EXPORT_SYMBOL(memmove); diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index a820ed0..5ef7a57 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -110,6 +110,8 @@ __efistub___flush_dcache_area = KALLSYMS_HIDE(__pi___flush_dcache_area); __efistub___memcpy = KALLSYMS_HIDE(__pi_memcpy); __efistub___memmove = KALLSYMS_HIDE(__pi_memmove); __efistub___memset = KALLSYMS_HIDE(__pi_memset); +__efistub___strcmp = KALLSYMS_HIDE(__pi_strcmp); +__efistub___strncmp = KALLSYMS_HIDE(__pi_strncmp); #endif __efistub__text = KALLSYMS_HIDE(_text); diff --git a/arch/arm64/lib/strcmp.S b/arch/arm64/lib/strcmp.S index 471fe61..0dffef7 100644 --- a/arch/arm64/lib/strcmp.S +++ b/arch/arm64/lib/strcmp.S @@ -60,6 +60,8 @@ tmp3 .req x9 zeroones .req x10 pos .req x11 +.weak strcmp +ENTRY(__strcmp) ENTRY(strcmp) eor tmp1, src1, src2 mov zeroones, #REP8_01 @@ -232,3 +234,4 @@ CPU_BE( orr syndrome, diff, has_nul ) sub result, data1, data2, lsr #56 ret ENDPIPROC(strcmp) +ENDPROC(__strcmp) diff --git a/arch/arm64/lib/strncmp.S b/arch/arm64/lib/strncmp.S index e267044..b2648c7 100644 --- a/arch/arm64/lib/strncmp.S +++ b/arch/arm64/lib/strncmp.S @@ -64,6 +64,8 @@ limit_wd .req x13 mask .req x14 endloop .req x15 +.weak strncmp +ENTRY(__strncmp) ENTRY(strncmp) cbz limit, .Lret0 eor tmp1, src1, src2 @@ -308,3 +310,4 @@ CPU_BE( orr syndrome, diff, has_nul ) mov result, #0 ret ENDPIPROC(strncmp) +ENDPROC(__strncmp) diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c index c3bd520..eae43e6 100644 --- a/mm/kasan/kasan.c +++ b/mm/kasan/kasan.c @@ -304,7 +304,22 @@ void *memcpy(void *dest, const void *src, size_t len) return __memcpy(dest, src, len); } +#undef strcmp +int strcmp(const char *cs, const char *ct) +{ + check_memory_region((unsigned long)cs, 1, false, _RET_IP_); + check_memory_region((unsigned long)ct, 1, false, _RET_IP_); + return __strcmp(cs, ct); +} +#undef strncmp +int strncmp(const char *cs, const char *ct, size_t len) +{ + check_memory_region((unsigned long)cs, len, false, _RET_IP_); + check_memory_region((unsigned long)ct, len, false, _RET_IP_); + + return __strncmp(cs, ct, len); +} void kasan_alloc_pages(struct page *page, unsigned int order) { if (likely(!PageHighMem(page)))