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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,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 73877C07E95 for ; Mon, 5 Jul 2021 02:41:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C9D6613D1 for ; Mon, 5 Jul 2021 02:41:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229818AbhGECnu (ORCPT ); Sun, 4 Jul 2021 22:43:50 -0400 Received: from mailgw01.mediatek.com ([60.244.123.138]:60827 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229652AbhGECnt (ORCPT ); Sun, 4 Jul 2021 22:43:49 -0400 X-UUID: 0de2ac8aea354174b7b4b19222f69d39-20210705 X-UUID: 0de2ac8aea354174b7b4b19222f69d39-20210705 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1225847933; Mon, 05 Jul 2021 10:41:10 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:09 +0800 From: To: CC: , , , , Yee Lee , Andrey Ryabinin , Alexander Potapenko , Dmitry Vyukov , Andrew Morton , Andrey Konovalov , Matthias Brugger , "open list:KASAN" , "open list:MEMORY MANAGEMENT" , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Subject: [PATCH v5 2/2] kasan: Add memzero int for unaligned size at DEBUG Date: Mon, 5 Jul 2021 10:40:58 +0800 Message-ID: <20210705024101.1567-3-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yee Lee Issue: when SLUB debug is on, hwtag kasan_unpoison() would overwrite the redzone of object with unaligned size. An additional memzero_explicit() path is added to replacing init by hwtag instruction for those unaligned size at SLUB debug mode. The penalty is acceptable since they are only enabled in debug mode, not production builds. A block of comment is added for explanation. Signed-off-by: Yee Lee Suggested-by: Marco Elver Suggested-by: Andrey Konovalov Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Dmitry Vyukov Cc: Andrew Morton --- mm/kasan/kasan.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 98e3059bfea4..a9d837197302 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -9,6 +9,7 @@ #ifdef CONFIG_KASAN_HW_TAGS #include +#include "../slab.h" DECLARE_STATIC_KEY_FALSE(kasan_flag_stacktrace); extern bool kasan_flag_async __ro_after_init; @@ -387,6 +388,17 @@ static inline void kasan_unpoison(const void *addr, size_t size, bool init) if (WARN_ON((unsigned long)addr & KASAN_GRANULE_MASK)) return; + /* + * Explicitly initialize the memory with the precise object size to + * avoid overwriting the SLAB redzone. This disables initialization in + * the arch code and may thus lead to performance penalty. The penalty + * is accepted since SLAB redzones aren't enabled in production builds. + */ + if (slub_debug_enabled_unlikely() && + init && ((unsigned long)size & KASAN_GRANULE_MASK)) { + init = false; + memzero_explicit((void *)addr, size); + } size = round_up(size, KASAN_GRANULE_SIZE); hw_set_mem_tag_range((void *)addr, size, tag, init); -- 2.18.0 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=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_BASE64_TEXT,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,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 9FAB9C07E95 for ; Mon, 5 Jul 2021 02:51:24 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3604E6135A for ; Mon, 5 Jul 2021 02:51:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3604E6135A 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 8E8FB6B005D; Sun, 4 Jul 2021 22:51:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 899616B006C; Sun, 4 Jul 2021 22:51:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 739966B0071; Sun, 4 Jul 2021 22:51:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 4A8C96B005D for ; Sun, 4 Jul 2021 22:51:23 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A99F88248047 for ; Mon, 5 Jul 2021 02:51:21 +0000 (UTC) X-FDA: 78327007962.08.F1A2AAB Received: from mailgw02.mediatek.com (mailgw02.mediatek.com [216.200.240.185]) by imf11.hostedemail.com (Postfix) with ESMTP id 297C1F0000B3 for ; Mon, 5 Jul 2021 02:51:19 +0000 (UTC) X-UUID: 12bab97c6bda4dc681ff5b14b5dd9da2-20210704 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:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=TJxOG717f7ZEBeyBa5KClESpjr7PlithXTgayw2FFUE=; b=Id7XHqzRuyzJM9koAJCWwKnreQGzoAtrXd+mvti/qEyvTCW5+OBUqXxhNmS8b/+d0Pj4JR+FsqGVLY0cvbHEahM3wtiMfsDLp1uaiW7JnDTrbi3NYGrr84/PD+ZL7U8G4soiOwD6FxIxvZ1l1QblcFA/zxny9p+seAI9Gy5frXc=; X-UUID: 12bab97c6bda4dc681ff5b14b5dd9da2-20210704 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1541651360; Sun, 04 Jul 2021 19:51:12 -0700 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Jul 2021 19:41:10 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:09 +0800 From: To: CC: , , , , Yee Lee , Andrey Ryabinin , "Alexander Potapenko" , Dmitry Vyukov , "Andrew Morton" , Andrey Konovalov , Matthias Brugger , "open list:KASAN" , "open list:MEMORY MANAGEMENT" , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Subject: [PATCH v5 2/2] kasan: Add memzero int for unaligned size at DEBUG Date: Mon, 5 Jul 2021 10:40:58 +0800 Message-ID: <20210705024101.1567-3-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=mediatek.com header.s=dk header.b=Id7XHqzR; dmarc=pass (policy=none) header.from=mediatek.com; spf=pass (imf11.hostedemail.com: domain of yee.lee@mediatek.com designates 216.200.240.185 as permitted sender) smtp.mailfrom=yee.lee@mediatek.com X-Rspamd-Server: rspam02 X-Stat-Signature: kk1tnhcqffikqkou65r19un1fhkddhyj X-Rspamd-Queue-Id: 297C1F0000B3 X-HE-Tag: 1625453479-263234 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: RnJvbTogWWVlIExlZSA8eWVlLmxlZUBtZWRpYXRlay5jb20+DQoNCklzc3VlOiB3aGVuIFNMVUIg ZGVidWcgaXMgb24sIGh3dGFnIGthc2FuX3VucG9pc29uKCkgd291bGQgb3ZlcndyaXRlDQp0aGUg cmVkem9uZSBvZiBvYmplY3Qgd2l0aCB1bmFsaWduZWQgc2l6ZS4NCg0KQW4gYWRkaXRpb25hbCBt ZW16ZXJvX2V4cGxpY2l0KCkgcGF0aCBpcyBhZGRlZCB0byByZXBsYWNpbmcgaW5pdCBieQ0KaHd0 YWcgaW5zdHJ1Y3Rpb24gZm9yIHRob3NlIHVuYWxpZ25lZCBzaXplIGF0IFNMVUIgZGVidWcgbW9k ZS4NCg0KVGhlIHBlbmFsdHkgaXMgYWNjZXB0YWJsZSBzaW5jZSB0aGV5IGFyZSBvbmx5IGVuYWJs ZWQgaW4gZGVidWcgbW9kZSwNCm5vdCBwcm9kdWN0aW9uIGJ1aWxkcy4gQSBibG9jayBvZiBjb21t ZW50IGlzIGFkZGVkIGZvciBleHBsYW5hdGlvbi4NCg0KU2lnbmVkLW9mZi1ieTogWWVlIExlZSA8 eWVlLmxlZUBtZWRpYXRlay5jb20+DQpTdWdnZXN0ZWQtYnk6IE1hcmNvIEVsdmVyIDxlbHZlckBn b29nbGUuY29tPg0KU3VnZ2VzdGVkLWJ5OiBBbmRyZXkgS29ub3ZhbG92IDxhbmRyZXlrbnZsQGdt YWlsLmNvbT4NCkNjOiBBbmRyZXkgUnlhYmluaW4gPHJ5YWJpbmluLmEuYUBnbWFpbC5jb20+DQpD YzogQWxleGFuZGVyIFBvdGFwZW5rbyA8Z2xpZGVyQGdvb2dsZS5jb20+DQpDYzogRG1pdHJ5IFZ5 dWtvdiA8ZHZ5dWtvdkBnb29nbGUuY29tPg0KQ2M6IEFuZHJldyBNb3J0b24gPGFrcG1AbGludXgt Zm91bmRhdGlvbi5vcmc+DQotLS0NCiBtbS9rYXNhbi9rYXNhbi5oIHwgMTIgKysrKysrKysrKysr DQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKykNCg0KZGlmZiAtLWdpdCBhL21tL2th c2FuL2thc2FuLmggYi9tbS9rYXNhbi9rYXNhbi5oDQppbmRleCA5OGUzMDU5YmZlYTQuLmE5ZDgz NzE5NzMwMiAxMDA2NDQNCi0tLSBhL21tL2thc2FuL2thc2FuLmgNCisrKyBiL21tL2thc2FuL2th c2FuLmgNCkBAIC05LDYgKzksNyBAQA0KICNpZmRlZiBDT05GSUdfS0FTQU5fSFdfVEFHUw0KIA0K ICNpbmNsdWRlIDxsaW51eC9zdGF0aWNfa2V5Lmg+DQorI2luY2x1ZGUgIi4uL3NsYWIuaCINCiAN CiBERUNMQVJFX1NUQVRJQ19LRVlfRkFMU0Uoa2FzYW5fZmxhZ19zdGFja3RyYWNlKTsNCiBleHRl cm4gYm9vbCBrYXNhbl9mbGFnX2FzeW5jIF9fcm9fYWZ0ZXJfaW5pdDsNCkBAIC0zODcsNiArMzg4 LDE3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBrYXNhbl91bnBvaXNvbihjb25zdCB2b2lkICphZGRy LCBzaXplX3Qgc2l6ZSwgYm9vbCBpbml0KQ0KIA0KIAlpZiAoV0FSTl9PTigodW5zaWduZWQgbG9u ZylhZGRyICYgS0FTQU5fR1JBTlVMRV9NQVNLKSkNCiAJCXJldHVybjsNCisJLyoNCisJICogRXhw bGljaXRseSBpbml0aWFsaXplIHRoZSBtZW1vcnkgd2l0aCB0aGUgcHJlY2lzZSBvYmplY3Qgc2l6 ZSB0bw0KKwkgKiBhdm9pZCBvdmVyd3JpdGluZyB0aGUgU0xBQiByZWR6b25lLiBUaGlzIGRpc2Fi bGVzIGluaXRpYWxpemF0aW9uIGluDQorCSAqIHRoZSBhcmNoIGNvZGUgYW5kIG1heSB0aHVzIGxl YWQgdG8gcGVyZm9ybWFuY2UgcGVuYWx0eS4gVGhlIHBlbmFsdHkNCisJICogaXMgYWNjZXB0ZWQg c2luY2UgU0xBQiByZWR6b25lcyBhcmVuJ3QgZW5hYmxlZCBpbiBwcm9kdWN0aW9uIGJ1aWxkcy4N CisJICovDQorCWlmIChzbHViX2RlYnVnX2VuYWJsZWRfdW5saWtlbHkoKSAmJg0KKwkgICAgaW5p dCAmJiAoKHVuc2lnbmVkIGxvbmcpc2l6ZSAmIEtBU0FOX0dSQU5VTEVfTUFTSykpIHsNCisJCWlu aXQgPSBmYWxzZTsNCisJCW1lbXplcm9fZXhwbGljaXQoKHZvaWQgKilhZGRyLCBzaXplKTsNCisJ fQ0KIAlzaXplID0gcm91bmRfdXAoc2l6ZSwgS0FTQU5fR1JBTlVMRV9TSVpFKTsNCiANCiAJaHdf c2V0X21lbV90YWdfcmFuZ2UoKHZvaWQgKilhZGRyLCBzaXplLCB0YWcsIGluaXQpOw0KLS0gDQoy LjE4LjANCg== 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, 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 346F9C07E95 for ; Mon, 5 Jul 2021 02:51:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 F1E8E6135A for ; Mon, 5 Jul 2021 02:51:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1E8E6135A 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-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=n1TnfV7Qyt8kes0WnQskU8zw7qonZHXMn6aGYeFM9FM=; b=NrZQcpFv53QIH8 N/qdy8XwOLpSFRCX0blIBIfDQ4kU13QbXPfrfxOg6xRNOB0iRp0ttH2GOzKGcWbcgcEHes9iT7DVy xeY1H9cS8VIpAb6MxOXRVZMk5aAcy7IJ5XpY2JCv8S61iTXR4F/05tqUMO5WLUomQkEHn2fOKXZvB cJph02rMRCeoqmJb4UlyX9vHV5jM8fkIV6VewURHfVkRJQF21bT+Z9UI8AuIy3E/CLpgV/wU8r4cv PrQADKN8mZKNQ9l/JX4Fd6BZgMw6GjYl9fW5yCFdAQMRbm5hTl6W0XSL2JNhTnYYau/S6SU6b69Qq 0PsScRAk8qvOlpPT28+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0Ehw-007XYO-7Q; Mon, 05 Jul 2021 02:51:40 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0EhZ-007XUs-FO; Mon, 05 Jul 2021 02:51:18 +0000 X-UUID: 12bab97c6bda4dc681ff5b14b5dd9da2-20210704 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:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=TJxOG717f7ZEBeyBa5KClESpjr7PlithXTgayw2FFUE=; b=Id7XHqzRuyzJM9koAJCWwKnreQGzoAtrXd+mvti/qEyvTCW5+OBUqXxhNmS8b/+d0Pj4JR+FsqGVLY0cvbHEahM3wtiMfsDLp1uaiW7JnDTrbi3NYGrr84/PD+ZL7U8G4soiOwD6FxIxvZ1l1QblcFA/zxny9p+seAI9Gy5frXc=; X-UUID: 12bab97c6bda4dc681ff5b14b5dd9da2-20210704 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1541651360; Sun, 04 Jul 2021 19:51:12 -0700 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Jul 2021 19:41:10 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:09 +0800 From: To: CC: , , , , Yee Lee , Andrey Ryabinin , "Alexander Potapenko" , Dmitry Vyukov , "Andrew Morton" , Andrey Konovalov , Matthias Brugger , "open list:KASAN" , "open list:MEMORY MANAGEMENT" , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Subject: [PATCH v5 2/2] kasan: Add memzero int for unaligned size at DEBUG Date: Mon, 5 Jul 2021 10:40:58 +0800 Message-ID: <20210705024101.1567-3-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210704_195117_565246_5798CF4C X-CRM114-Status: GOOD ( 13.25 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Yee Lee Issue: when SLUB debug is on, hwtag kasan_unpoison() would overwrite the redzone of object with unaligned size. An additional memzero_explicit() path is added to replacing init by hwtag instruction for those unaligned size at SLUB debug mode. The penalty is acceptable since they are only enabled in debug mode, not production builds. A block of comment is added for explanation. Signed-off-by: Yee Lee Suggested-by: Marco Elver Suggested-by: Andrey Konovalov Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Dmitry Vyukov Cc: Andrew Morton --- mm/kasan/kasan.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 98e3059bfea4..a9d837197302 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -9,6 +9,7 @@ #ifdef CONFIG_KASAN_HW_TAGS #include +#include "../slab.h" DECLARE_STATIC_KEY_FALSE(kasan_flag_stacktrace); extern bool kasan_flag_async __ro_after_init; @@ -387,6 +388,17 @@ static inline void kasan_unpoison(const void *addr, size_t size, bool init) if (WARN_ON((unsigned long)addr & KASAN_GRANULE_MASK)) return; + /* + * Explicitly initialize the memory with the precise object size to + * avoid overwriting the SLAB redzone. This disables initialization in + * the arch code and may thus lead to performance penalty. The penalty + * is accepted since SLAB redzones aren't enabled in production builds. + */ + if (slub_debug_enabled_unlikely() && + init && ((unsigned long)size & KASAN_GRANULE_MASK)) { + init = false; + memzero_explicit((void *)addr, size); + } size = round_up(size, KASAN_GRANULE_SIZE); hw_set_mem_tag_range((void *)addr, size, tag, init); -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=unavailable 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 2DA76C07E95 for ; Mon, 5 Jul 2021 02:53:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E0F48613D2 for ; Mon, 5 Jul 2021 02:53:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0F48613D2 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8k3IrFFM62asjGPkse3K/qWTB94lrjQ0SKVlQ1frc60=; b=ickU0FjpA5sfMX wei0IDjlcBUROnaYOSkxAjNYND/S1Vtdm+sX8Nc6X78CxFqdJXTswiUQ+YzzugOMhK5SUf1o5nXkp A9TBPQ2wwDFIfUFeA31NPQfw3z25m1Bk/vcieLDVpEdz6SPsPGm2pN9lIDw2JHK5zunQzk8lJGZGH Cl5ngzOSJ/mTLRsXbJaBOODvNPGANziTYyfY3Gtgtr/2/krok4zHfhL9Ps9f9aAFWd1LC6tu1U/Q/ U+5pWS/Ig2W2yYx8bGVYp+iNtNZfn3ONYx938+2Y7A/FgV1/ZNyWYYexpxpeggZP6ntNqZIzszlcO j7u6W4FQace+a7TIkpSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0Ehn-007XXL-53; Mon, 05 Jul 2021 02:51:31 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0EhZ-007XUs-FO; Mon, 05 Jul 2021 02:51:18 +0000 X-UUID: 12bab97c6bda4dc681ff5b14b5dd9da2-20210704 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:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=TJxOG717f7ZEBeyBa5KClESpjr7PlithXTgayw2FFUE=; b=Id7XHqzRuyzJM9koAJCWwKnreQGzoAtrXd+mvti/qEyvTCW5+OBUqXxhNmS8b/+d0Pj4JR+FsqGVLY0cvbHEahM3wtiMfsDLp1uaiW7JnDTrbi3NYGrr84/PD+ZL7U8G4soiOwD6FxIxvZ1l1QblcFA/zxny9p+seAI9Gy5frXc=; X-UUID: 12bab97c6bda4dc681ff5b14b5dd9da2-20210704 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1541651360; Sun, 04 Jul 2021 19:51:12 -0700 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Jul 2021 19:41:10 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:09 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:09 +0800 From: To: CC: , , , , Yee Lee , Andrey Ryabinin , "Alexander Potapenko" , Dmitry Vyukov , "Andrew Morton" , Andrey Konovalov , Matthias Brugger , "open list:KASAN" , "open list:MEMORY MANAGEMENT" , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Subject: [PATCH v5 2/2] kasan: Add memzero int for unaligned size at DEBUG Date: Mon, 5 Jul 2021 10:40:58 +0800 Message-ID: <20210705024101.1567-3-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210704_195117_565246_5798CF4C X-CRM114-Status: GOOD ( 13.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Yee Lee Issue: when SLUB debug is on, hwtag kasan_unpoison() would overwrite the redzone of object with unaligned size. An additional memzero_explicit() path is added to replacing init by hwtag instruction for those unaligned size at SLUB debug mode. The penalty is acceptable since they are only enabled in debug mode, not production builds. A block of comment is added for explanation. Signed-off-by: Yee Lee Suggested-by: Marco Elver Suggested-by: Andrey Konovalov Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Dmitry Vyukov Cc: Andrew Morton --- mm/kasan/kasan.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 98e3059bfea4..a9d837197302 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -9,6 +9,7 @@ #ifdef CONFIG_KASAN_HW_TAGS #include +#include "../slab.h" DECLARE_STATIC_KEY_FALSE(kasan_flag_stacktrace); extern bool kasan_flag_async __ro_after_init; @@ -387,6 +388,17 @@ static inline void kasan_unpoison(const void *addr, size_t size, bool init) if (WARN_ON((unsigned long)addr & KASAN_GRANULE_MASK)) return; + /* + * Explicitly initialize the memory with the precise object size to + * avoid overwriting the SLAB redzone. This disables initialization in + * the arch code and may thus lead to performance penalty. The penalty + * is accepted since SLAB redzones aren't enabled in production builds. + */ + if (slub_debug_enabled_unlikely() && + init && ((unsigned long)size & KASAN_GRANULE_MASK)) { + init = false; + memzero_explicit((void *)addr, size); + } size = round_up(size, KASAN_GRANULE_SIZE); hw_set_mem_tag_range((void *)addr, size, tag, init); -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel