From patchwork Wed Dec 4 08:34:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Ge X-Patchwork-Id: 13893390 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 35387E7716B for ; Wed, 4 Dec 2024 08:35:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5481D6B007B; Wed, 4 Dec 2024 03:35:47 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F87B6B0082; Wed, 4 Dec 2024 03:35:47 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E6F66B0083; Wed, 4 Dec 2024 03:35:47 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 210AD6B007B for ; Wed, 4 Dec 2024 03:35:47 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 845F8A01C7 for ; Wed, 4 Dec 2024 08:35:46 +0000 (UTC) X-FDA: 82856617620.08.A861124 Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) by imf19.hostedemail.com (Postfix) with ESMTP id 481551A0012 for ; Wed, 4 Dec 2024 08:35:29 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dQbCY2EQ; spf=pass (imf19.hostedemail.com: domain of hao.ge@linux.dev designates 91.218.175.174 as permitted sender) smtp.mailfrom=hao.ge@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733301334; 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=WQ/bt9UKnbTwCWMXSy/te0h7IEpxPojbhIAC28Qjeok=; b=RpfMvqoOa1tkCZhyCBDLVB/Mpkv5JFaRoC4eGaThzngW2iZtWFalGqm+cuEsg94S2Um6bU YszrJsnKkOPBQdYVyvQXFlFU4UIafLT3dqTilnyYvIJv+LBpRHePYPE56ynlp1cs0CFcqV XoR0AMKarHsjH5WN2mIunoCtUfFWWgw= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=dQbCY2EQ; spf=pass (imf19.hostedemail.com: domain of hao.ge@linux.dev designates 91.218.175.174 as permitted sender) smtp.mailfrom=hao.ge@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733301334; a=rsa-sha256; cv=none; b=disdQThdU8OPGgYKpNoUnJmxL341VdOt44BbxH9Rk9etoC5xMDahRsvwkmiGonf5JD5N5a 9wKOG2uDfi+NYQ/Z8NyTps0caobjeClU7P9AYyNH4YpFt9Mr5WWXYJ30ql8cnfVKbSP6ku txDr70J2t3qMDS69gbPY2kBPbqqc+W8= 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=1733301342; 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=WQ/bt9UKnbTwCWMXSy/te0h7IEpxPojbhIAC28Qjeok=; b=dQbCY2EQZIzXZjdvlEpa0YXDQaXBl2uX/Kox8kvYpk+fyff8onQeV3AddiDxpQPkEWJaap EHUBr+INzuYLNmgQj+vg2Yl232EiW7epwtzxFjjclMAPcng0hDaBAMZ/sddGBzofA3duce 1JPlyzm3E7eaQABgPLbH1hhheB9bW7M= From: Hao Ge To: surenb@google.com, kent.overstreet@linux.dev, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, hao.ge@linux.dev, Hao Ge Subject: [PATCH v2] mm/alloc_tag: fix vm_module_tags_populate's KASAN poisoning logic Date: Wed, 4 Dec 2024 16:34:48 +0800 Message-Id: <20241204083448.387862-1-hao.ge@linux.dev> In-Reply-To: <20241204075248.384215-1-hao.ge@linux.dev> References: <20241204075248.384215-1-hao.ge@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 481551A0012 X-Rspamd-Server: rspam12 X-Stat-Signature: bksyu7safgyhs3phf69tma6zp43sxjgf X-Rspam-User: X-HE-Tag: 1733301329-308980 X-HE-Meta: U2FsdGVkX19MbCsl3SXLv+/dF96cypjo/aS6fY7/dtlR5gLcO7goyqG2uzObWGUDIhTh0zYZ18xPrkZn3eQZCr2NibK1LBKh58CEg/SxaQX9/M0A+zuj8fAepvnmFEEg2o26/IgaGF4czrEjpjabbG7gX49DWv5tkS6yr/wz0BpdpvbAlRLTB+yatzfNyM9sZeqpt5JrL+HkVPrTCifmRxV+7y+aDxP92EFPno0a7MNN1zd+QOHaovfg3QXmAbm5qzZT8uJNsxBVJWrjg6pNrWnuqssH12A9ialMf5os4xcu1cOkpwYcb7uZ2QeeZ8gyA+M/RbJTyL0SovkrE6zVRNWW0FSwF27N/PAsnPMYhS8V5DN753dGhPINQ7BLMIcsYffbFkOT4IKdfhs3MXh3PChh4eUQq4trt9Zs5f1ZipLQXClrfxEhGX2OSqvcguJQNJv6yRXa+9wJbpyDASBehk1pWqOBFUUPmSAhUFQLlNDp94nAU1PK5yWs9QnGZPTx7pNPKAAWs6I6CQcrp+3TcF2IcJuq4ciZ8Qw1zgQaYF1JNQTE2gCdD7rnZvWBTbgMDQ/cDvOHnC+b72sfxNU6a346GBlc6dh8Are7h/zGAo1ZSn01SIh2Up6d0f76Cfhikb9vO5jWTs8uqbFyE3smhLV+Xzaz0lXO0KG2K4+ZYJbJJsMdC4cVyP1037r3P6jfLF5ygZY7e0HxBGil3tmxgTsAfiReOButtCEASqf6G6qQ3NgwlrKuz/eGyprmseW6Z1i4T7pnuaCheC8z4T9qI+UfIHv8g2bTGTEoLXi9mJ6lYiMUMu/p4i7KFTLysrNOu2BG9zL+CdYiItQfDWK40aTmiby8U/LyB2YoW5KUfcnHAcIvY3SpWMLEgd8iQAuISIpb5JqiwYUJzuR5u1YEzdnbjMqL+27x79tfgEUBLlHRgT/r8QlShow+aPi8NXLZD2tMh1eVLUgLKw5OpCN PWa9OwIq 0/bqrVZK/9XF61UC2jt9cVkDeh8LyNDAqED6l6Mxh3Mkc2DsN70FKiMdky8xfBqPWTO2Hn72NtraMWP+TTB3w5oWvKdvy8iL7kAtpyW7gQKeWVhRVBOcG/0Tk3ZkvqwB9ZMkIeQ5YAI0TKtGTsNMncCc2xSWLu+SKcZsKIvOhngzPUMKv/CgBnQDjgg== 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: Hao Ge After merge commit 233e89322cbe ("alloc_tag: fix module allocation tags populated area calculation"), We still encountered a KASAN bug. This is because we have only actually performed page allocation and address mapping here. we need to unpoisoned portions of underlying memory. Because we have a change in the size here,we need to re-annotate poisoned and unpoisoned portions of underlying memory according to the new size. Here is the log for KASAN: [ 5.041171][ T1] ================================================================== [ 5.042047][ T1] BUG: KASAN: vmalloc-out-of-bounds in move_module+0x2c0/0x708 [ 5.042723][ T1] Write of size 240 at addr ffff80007e510000 by task systemd/1 [ 5.043412][ T1] [ 5.043523][ T72] input: QEMU QEMU USB Tablet as /devices/pci0000:00/0000:00:01.1/0000:02:001 [ 5.043614][ T1] CPU: 0 UID: 0 PID: 1 Comm: systemd Not tainted 6.13.0-rc1+ #28 [ 5.045560][ T1] Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 [ 5.046328][ T1] Call trace: [ 5.046670][ T1] show_stack+0x20/0x38 (C) [ 5.047127][ T1] dump_stack_lvl+0x80/0xf8 [ 5.047533][ T1] print_address_description.constprop.0+0x58/0x358 [ 5.048092][ T72] hid-generic 0003:0627:0001.0001: input,hidraw0: USB HID v0.01 Mouse [QEMU 0 [ 5.048126][ T1] print_report+0xb0/0x280 [ 5.049682][ T1] kasan_report+0xb8/0x108 [ 5.050170][ T1] kasan_check_range+0xe8/0x190 [ 5.050685][ T1] memcpy+0x58/0xa0 [ 5.051135][ T1] move_module+0x2c0/0x708 [ 5.051586][ T1] layout_and_allocate.constprop.0+0x308/0x5b8 [ 5.052219][ T1] load_module+0x134/0x16c8 [ 5.052671][ T1] init_module_from_file+0xdc/0x138 [ 5.053193][ T1] idempotent_init_module+0x344/0x600 [ 5.053742][ T1] __arm64_sys_finit_module+0xbc/0x150 [ 5.054289][ T1] invoke_syscall+0xd4/0x258 [ 5.054749][ T1] el0_svc_common.constprop.0+0xb4/0x240 [ 5.055319][ T1] do_el0_svc+0x48/0x68 [ 5.055743][ T1] el0_svc+0x40/0xe0 [ 5.056142][ T1] el0t_64_sync_handler+0x10c/0x138 [ 5.056658][ T1] el0t_64_sync+0x1ac/0x1b0 Fixes: 233e89322cbe ("alloc_tag: fix module allocation tags populated area calculation") Signed-off-by: Hao Ge --- v2: Add comments to kasan_unpoison_vmalloc like other places. commit 233e89322cbe ("alloc_tag: fix module allocation tags populated area calculation") is currently in the mm-hotfixes-unstable branch, so this patch is developed based on the mm-hotfixes-unstable branch. --- lib/alloc_tag.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/alloc_tag.c b/lib/alloc_tag.c index 4ee6caa6d2da..f885b3f3af0e 100644 --- a/lib/alloc_tag.c +++ b/lib/alloc_tag.c @@ -421,7 +421,20 @@ static int vm_module_tags_populate(void) __free_page(next_page[i]); return -ENOMEM; } + + kasan_poison_vmalloc((void *)module_tags.start_addr, + vm_module_tags->nr_pages << PAGE_SHIFT); + vm_module_tags->nr_pages += nr; + + /* + * Mark the pages as accessible, now that they are mapped. + * With hardware tag-based KASAN, marking is skipped for + * non-VM_ALLOC mappings, see __kasan_unpoison_vmalloc(). + */ + kasan_unpoison_vmalloc((void *)module_tags.start_addr, + vm_module_tags->nr_pages << PAGE_SHIFT, + KASAN_VMALLOC_PROT_NORMAL); } return 0;