From patchwork Wed Nov 30 08:54:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Tang X-Patchwork-Id: 13059590 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E814BC433FE for ; Wed, 30 Nov 2022 08:57:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8120C6B0073; Wed, 30 Nov 2022 03:57:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C1B56B0074; Wed, 30 Nov 2022 03:57:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 688026B0075; Wed, 30 Nov 2022 03:57:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 56F676B0073 for ; Wed, 30 Nov 2022 03:57:54 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1F6EE1210A3 for ; Wed, 30 Nov 2022 08:57:54 +0000 (UTC) X-FDA: 80189506068.13.7615089 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by imf09.hostedemail.com (Postfix) with ESMTP id 6A79F140011 for ; Wed, 30 Nov 2022 08:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669798672; x=1701334672; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wUhL46G8FczpkZOn55ukJFkU1wtUnvW4RJiQUOueOmw=; b=L22zVcbUXLw3oi0isFiokU7qnNAdeTwelHanWr9oeyDeqC0BzO9mfPNJ ZcrcE7kr2Iy4Tcsei8Lopvd+mfejACYO1D/22gLR5f4115eguWtYeL374 aQaKZrnMSyUxOdIWtJT2vTJl/b9KFwnsgbElyTA9QIcxBP5c6PJEKGNm4 P70BAsyKrxUR5pySNdMUZf9p1rO9SMoswWug67ZEBU4rFV+FY0CzeT5fg MwA7ARhwYEQ2ZlNXeSvcl70c85FE4ezAk3dHohbdRUqY++MzM5gYDAPld w5M3d7syM9w96UD326tHY1CK9137c7lfWhlwOS4nFm4J4dVg06nLazICQ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="295039305" X-IronPort-AV: E=Sophos;i="5.96,205,1665471600"; d="scan'208";a="295039305" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2022 00:57:51 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10546"; a="973026150" X-IronPort-AV: E=Sophos;i="5.96,205,1665471600"; d="scan'208";a="973026150" Received: from feng-clx.sh.intel.com ([10.238.200.228]) by fmsmga005.fm.intel.com with ESMTP; 30 Nov 2022 00:57:48 -0800 From: Feng Tang To: Vlastimil Babka , Marco Elver , Andrew Morton , Oliver Glitta , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Feng Tang Subject: [PATCH v3 2/2] mm/slub, kunit: Add a test case for kmalloc redzone check Date: Wed, 30 Nov 2022 16:54:51 +0800 Message-Id: <20221130085451.3390992-2-feng.tang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221130085451.3390992-1-feng.tang@intel.com> References: <20221130085451.3390992-1-feng.tang@intel.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=L22zVcbU; spf=pass (imf09.hostedemail.com: domain of feng.tang@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=feng.tang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1669798672; a=rsa-sha256; cv=none; b=rXACU4LqBZNczDQZFeLmEXntq7BU4kV+32XvNY6lx/TABOjpGAC8aB1bWmnNdleNPVT2AA /i9Tw6c/juUf5AviB/acdkFX6dGJ0ohFKc80FXBhnWVs9hAfiHICrTVjgQfdegXThFmPiu 2aA7ul0bTyMSJi2g8e7QA41ZnWZC+8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1669798672; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HoRYI/mRl2a8hByRgyN9XAWD5nRydxhExVY5fJ/6gMk=; b=i1G0+4dngiMQR1ICrOp1GGu6m43i7qODBYOvH4scoS4qTKJrvSToFtbQG3gBuCbBydR7XB rAhusPal4Tf6VejVtKeyUBBSgaUF7UpbLVrQd47SpWoyDjMG6enx2lCd4fpYu4ngnSDTV6 zqTilyO4wgQtXuXPHAaBjXazTKbm1+M= Authentication-Results: imf09.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=L22zVcbU; spf=pass (imf09.hostedemail.com: domain of feng.tang@intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=feng.tang@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Rspamd-Server: rspam01 X-Stat-Signature: atrrkz8oyx1heejns4kd8x8jexbsqpdp X-Rspamd-Queue-Id: 6A79F140011 X-Rspam-User: X-HE-Tag: 1669798672-907248 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: kmalloc redzone check for slub has been merged, and it's better to add a kunit case for it, which is inspired by a real-world case as described in commit 120ee599b5bf ("staging: octeon-usb: prevent memory corruption"): " octeon-hcd will crash the kernel when SLOB is used. This usually happens after the 18-byte control transfer when a device descriptor is read. The DMA engine is always transferring full 32-bit words and if the transfer is shorter, some random garbage appears after the buffer. The problem is not visible with SLUB since it rounds up the allocations to word boundary, and the extra bytes will go undetected. " To avoid interrupting the normal functioning of kmalloc caches, a kmem_cache mimicing kmalloc cache is created with similar flags, and kmalloc_trace() is used to really test the orig_size and redzone setup. Suggested-by: Vlastimil Babka Signed-off-by: Feng Tang Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- Changelog: since v2: * only add SLAB_KMALLOC to SLAB_CACHE_FLAGS and SLAB_FLAGS_PERMITTEDa, and use new wrapper of cache creation(Vlastimil Babka) since v1: * create a new cache mimicing kmalloc cache, reduce dependency over global slub_debug setting (Vlastimil Babka) lib/slub_kunit.c | 22 ++++++++++++++++++++++ mm/slab.h | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c index 5b0c8e7eb6dc..ff24879e3afe 100644 --- a/lib/slub_kunit.c +++ b/lib/slub_kunit.c @@ -135,6 +135,27 @@ static void test_clobber_redzone_free(struct kunit *test) kmem_cache_destroy(s); } +static void test_kmalloc_redzone_access(struct kunit *test) +{ + struct kmem_cache *s = test_kmem_cache_create("TestSlub_RZ_kmalloc", 32, + SLAB_KMALLOC|SLAB_STORE_USER|SLAB_RED_ZONE); + u8 *p = kmalloc_trace(s, GFP_KERNEL, 18); + + kasan_disable_current(); + + /* Suppress the -Warray-bounds warning */ + OPTIMIZER_HIDE_VAR(p); + p[18] = 0xab; + p[19] = 0xab; + + kmem_cache_free(s, p); + validate_slab_cache(s); + KUNIT_EXPECT_EQ(test, 2, slab_errors); + + kasan_enable_current(); + kmem_cache_destroy(s); +} + static int test_init(struct kunit *test) { slab_errors = 0; @@ -154,6 +175,7 @@ static struct kunit_case test_cases[] = { #endif KUNIT_CASE(test_clobber_redzone_free), + KUNIT_CASE(test_kmalloc_redzone_access), {} }; diff --git a/mm/slab.h b/mm/slab.h index c71590f3a22b..7cc432969945 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -344,7 +344,8 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, SLAB_ACCOUNT) #elif defined(CONFIG_SLUB) #define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE | SLAB_RECLAIM_ACCOUNT | \ - SLAB_TEMPORARY | SLAB_ACCOUNT | SLAB_NO_USER_FLAGS) + SLAB_TEMPORARY | SLAB_ACCOUNT | \ + SLAB_NO_USER_FLAGS | SLAB_KMALLOC) #else #define SLAB_CACHE_FLAGS (SLAB_NOLEAKTRACE) #endif @@ -364,6 +365,7 @@ static inline slab_flags_t kmem_cache_flags(unsigned int object_size, SLAB_RECLAIM_ACCOUNT | \ SLAB_TEMPORARY | \ SLAB_ACCOUNT | \ + SLAB_KMALLOC | \ SLAB_NO_USER_FLAGS) bool __kmem_cache_empty(struct kmem_cache *);