From patchwork Mon Nov 6 20:10:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13447460 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 E2362C4332F for ; Mon, 6 Nov 2023 20:12:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 795C96B02A0; Mon, 6 Nov 2023 15:12:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7459C6B02A1; Mon, 6 Nov 2023 15:12:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65C4C6B02A2; Mon, 6 Nov 2023 15:12:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 575586B02A0 for ; Mon, 6 Nov 2023 15:12:48 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 255B3120773 for ; Mon, 6 Nov 2023 20:12:47 +0000 (UTC) X-FDA: 81428627574.29.97D10FB Received: from out-178.mta1.migadu.com (out-178.mta1.migadu.com [95.215.58.178]) by imf05.hostedemail.com (Postfix) with ESMTP id 37892100014 for ; Mon, 6 Nov 2023 20:12:44 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=pwv3dkzf; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf05.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.178 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699301565; 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=pzcd7T6SaBRo5t2Dalks3vRx+ahOG8KGm+CRn7Qcn4c=; b=BGzbBNgzQHQxYLYJ1e/3OsTFBIxSG5eLh7fz/9Xu4pwitmstnkFxO0VfSW1SEWJ83E9L6N vYbeFLZwpk/CSle7mZi1jmpD5ggOKK7KWPl0ctAhuOIRJkzyV4MZDe3CzRSzmJZVvwnPx1 iXksiJJfv/o7z/q/LYy896/1C3gRNn4= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=pwv3dkzf; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf05.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.178 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699301565; a=rsa-sha256; cv=none; b=4/Th49rvHSZqYEuDTFIFoFFSXzQ38QcT/Z18O0E+wph/3zHkbEVLRF4ZmcKu4Xr1/z9G1D PUBSlbsYFacUddRbXiP9uCKqsjvUDcST2MoUkD4xkjM3Md81vycyxhG3qkEJDVN9sQ/EX+ J06d3X8nuA1ZZnRd20C4/4/rBmP05DU= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1699301563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pzcd7T6SaBRo5t2Dalks3vRx+ahOG8KGm+CRn7Qcn4c=; b=pwv3dkzff3LD7yWHcbYcgAz4JV6yfUR59dhP8YxPHgOJqBy44vK2HoY3LSsvhd8ac/r+Kw YjUTxsAxtuUXSOSqxissVE/DJambefCo5UZhQA3OpygTzSXNBEkWw+ttz9+sRuo965g4Qr dO5rxteHGvoYv4f78rDOUpqGsj2A/J4= From: andrey.konovalov@linux.dev To: Marco Elver , Alexander Potapenko Cc: Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Evgenii Stepanov , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH RFC 12/20] kasan: save alloc stack traces for mempool Date: Mon, 6 Nov 2023 21:10:21 +0100 Message-Id: <325b1285d95f7bb6d2865750aa0088ab4cb5e0c3.1699297309.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Stat-Signature: ofpr7n86h5bgx84nap1xc68n3xodgkx4 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 37892100014 X-HE-Tag: 1699301564-990804 X-HE-Meta: U2FsdGVkX1+4+Cj8pRi8pwfURzza3cU0rcgKEHq9xLVByKD3NCbUd/0Gf1i0yGhw2gwWW2XYxuEpz86eEv9E/vSa17g7EiJJ24Xk+M0B+/OLm7DqaS6SXBFIrhrr2EbtqX5bnrT/azbfdX98QQqEaai+71CmX68x4s+Vz+hbBtzeHqcmVHo5LIVkUf7bXMwRicUvTytcs9XMA7sv06H3aaXPL5FPifsEQi3C4UJA5NP73vZUsZec7qqkakvF3G4xxGxPpo8Pn3zznqN9cLOpLZiWyKKDZkmUhMebW8lDDN4XujnsaFo+3r2RqwOaP0M0OMmDn0IFsIMPE22hoKKGi4BZJB6Xfy26MXVIqA696RZCo/HrlqSdREAkly1JricTHjsyyVvPFI5LYl3RptovlbDUE95vkDi4QNcTnCHNOIdttdpWU1IJ3rN8FlCv/9xSdslE4k/dJJaf5c1KoR2pCJUzRamKKGFgx1rpN1Djy0QBJL7HAxXaJazPfbCKwGbIRJbvBBlqTaglUkC9RttKG1EMPeg8SpNpeBXN61JzlpMgdFZG1AUzUVu05VYySkJe6V0zFqHMjYr7x0Nb2i7a2PlOHx9kumbGj8uF9zBiQP71LwIVCyeBEKSPp438xHVNsBjc4ijaQXYv5CYIgNFTvtOTmzr2O1E7HxrJGG8auxn7Z15h+8ENeMWQBFcM9iIUmJsBrctSfIf07oJkXGVLphnl7ASI2snRfg7bZKoQf+n4DcJUbgRjKiuqWC57D9+nN/zdLlQ+0aIMNGxjZk473EY6SUPEaSOgU7t1QM4cwBkwhwfM89WY9Tx3Gx2qYoMuBbrY/kBfKBTZVD0j3EJlFltMmwSl5cGyrK0WOa/UajcDRsShKQ4YhO5TbkK3yS68o99Tskje+mKf4dhHGUCQoMeyMJnW9WDNWhZR8U8biAiHqSTvKHc9jvu+Xd0wnZonvML0TFfQYQXiEj3+eIp fxwwLn40 9TEdw7o0f1LUiixY1LVGOykRo76rgqXff2VFqKk0yF6AJcQEeCgeVRtF42q6AUmZAozBwMYUAvEVri4/XGwRQmYFy+LM9m36w8V+ZpUnjAoN6ocSdw95Bi9RS/ung3eotrgWBwDzZRJK0EyJ2QGkQ99iuvNB24E66+jKCnIZDR5UHqFE= 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: List-Subscribe: List-Unsubscribe: From: Andrey Konovalov Update kasan_mempool_unpoison_object to properly poison the redzone and save alloc strack traces for kmalloc and slab pools. As a part of this change, split out and use a unpoison_slab_object helper function from __kasan_slab_alloc. Signed-off-by: Andrey Konovalov --- include/linux/kasan.h | 7 +++--- mm/kasan/common.c | 50 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 13 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index e636a00e26ba..7392c5d89b92 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -303,9 +303,10 @@ void __kasan_mempool_unpoison_object(void *ptr, size_t size, unsigned long ip); * mempool). * * This function unpoisons a slab allocation that was previously poisoned via - * kasan_mempool_poison_object() without initializing its memory. For the - * tag-based modes, this function does not assign a new tag to the allocation - * and instead restores the original tags based on the pointer value. + * kasan_mempool_poison_object() and saves an alloc stack trace for it without + * initializing the allocation's memory. For the tag-based modes, this function + * does not assign a new tag to the allocation and instead restores the + * original tags based on the pointer value. * * This function operates on all slab allocations including large kmalloc * allocations (the ones returned by kmalloc_large() or by kmalloc() with the diff --git a/mm/kasan/common.c b/mm/kasan/common.c index b50e4fbaf238..65850d37fd27 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -267,6 +267,20 @@ void __kasan_kfree_large(void *ptr, unsigned long ip) /* The object will be poisoned by kasan_poison_pages(). */ } +void unpoison_slab_object(struct kmem_cache *cache, void *object, gfp_t flags, + bool init) +{ + /* + * Unpoison the whole object. For kmalloc() allocations, + * poison_kmalloc_redzone() will do precise poisoning. + */ + kasan_unpoison(object, cache->object_size, init); + + /* Save alloc info (if possible) for non-kmalloc() allocations. */ + if (kasan_stack_collection_enabled() && !is_kmalloc_cache(cache)) + kasan_save_alloc_info(cache, object, flags); +} + void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, void *object, gfp_t flags, bool init) { @@ -289,15 +303,8 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, tag = assign_tag(cache, object, false); tagged_object = set_tag(object, tag); - /* - * Unpoison the whole object. - * For kmalloc() allocations, kasan_kmalloc() will do precise poisoning. - */ - kasan_unpoison(tagged_object, cache->object_size, init); - - /* Save alloc info (if possible) for non-kmalloc() allocations. */ - if (kasan_stack_collection_enabled() && !is_kmalloc_cache(cache)) - kasan_save_alloc_info(cache, tagged_object, flags); + /* Unpoison the object and save alloc info for non-kmalloc() allocations. */ + unpoison_slab_object(cache, tagged_object, flags, init); return tagged_object; } @@ -472,7 +479,30 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip) void __kasan_mempool_unpoison_object(void *ptr, size_t size, unsigned long ip) { - kasan_unpoison(ptr, size, false); + struct slab *slab; + gfp_t flags = 0; /* Might be executing under a lock. */ + + if (is_kfence_address(kasan_reset_tag(ptr))) + return; + + slab = virt_to_slab(ptr); + + /* + * This function can be called for large kmalloc allocation that get + * their memory from page_alloc. + */ + if (unlikely(!slab)) { + kasan_unpoison(ptr, size, false); + poison_kmalloc_large_redzone(ptr, size, flags); + return; + } + + /* Unpoison the object and save alloc info for non-kmalloc() allocations. */ + unpoison_slab_object(slab->slab_cache, ptr, size, flags); + + /* Poison the redzone and save alloc info for kmalloc() allocations. */ + if (is_kmalloc_cache(slab->slab_cache)) + poison_kmalloc_redzone(slab->slab_cache, ptr, size, flags); } bool __kasan_check_byte(const void *address, unsigned long ip)