From patchwork Fri Sep 15 12:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 140408 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1016807vqi; Fri, 15 Sep 2023 05:48:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG2nEs3u9uPA/qoplo/RXbsyWV6BeKMSZ8Z1v2d666Q5LNfbPCDmTKcb0EpH0GONSDykBRK X-Received: by 2002:a05:6358:7e54:b0:132:d078:9a05 with SMTP id p20-20020a0563587e5400b00132d0789a05mr1774908rwm.14.1694782081624; Fri, 15 Sep 2023 05:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694782081; cv=none; d=google.com; s=arc-20160816; b=y5ti+/xO4okJKLvr30XY7QvdhGD2EUfAaJBQbL4CAHRNZx768Q5avY145LWDPVze6F 9hbSWBJMntawHQ/AKc+7DhCxXR9dRYQ8eb/HpMLe5w9z21U9pMUeTgnIWjq0JainrJUo Ag5FJ+sEy/pYFoWgVEl8rsZ6Z/AXgMZujXn+p+AHAuIDuCULipjnXznEEqqsdV8rj1DF XAF/gZqbQPCtu71gT8UzQ/cZHIRXN4SPNlp1uMhkfUEF4DpmyliIJp+hBwwtlUDraAk/ HgiQos4q5qMxWnxxAEmkdFLY5iskKYgo+g0iR7DgHZs2ccGozhNArUrQTMqU4iYrU2W3 xtuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=nnf5oMr/2nfLEUBXk1MP6KaTYPhiFx3zpXxqVQdLfn8=; fh=cAATQBhy3suvhTuuVVrdM7Ka/4SAGu7tDT9Mm2RT6ys=; b=l6zOAhVuabIXCskDl8sJAjnKMyirLE6Ws3uiS8dH7mBdLC3FyHilHptZnHgfnTpeNq RTMOU4Vt8qT18G3Pdq+JjsxUhIBjj79/FRm/q354YCVdtMaQlShBRnSLRs3bdTIlaI4u 8W0B3AxiyaksgiNMfJfYlK96fWKDGA1Ew1TK9l/CESMazSMCavkpbQEmWLo/78WDkLpi 4oDEnpcr8vM3hKW2quMvn4yQiW4aaV7ILcYSFBBZsGejY2VyvA957ens5rmlakd6M9mC 1QzHA/zDLLN2PlcMDgYqglGca0UNXLsaBMEt59U9Rd0rRIct8hzcPOxpLjuVA2O3o9Ug D3cw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id l62-20020a639141000000b00565bcc15ee2si3233432pge.815.2023.09.15.05.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 05:48:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C2D82826FB48; Fri, 15 Sep 2023 05:37:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234946AbjIOMhC (ORCPT + 32 others); Fri, 15 Sep 2023 08:37:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234939AbjIOMhA (ORCPT ); Fri, 15 Sep 2023 08:37:00 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 021E019F for ; Fri, 15 Sep 2023 05:36:54 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4RnDBx1L4szVknN; Fri, 15 Sep 2023 20:34:01 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Fri, 15 Sep 2023 20:36:51 +0800 From: Jinjie Ruan To: , , , , , , CC: Subject: [PATCH v2 1/2] static_call: Fix a wild-memory-access bug in static_call_del_module() Date: Fri, 15 Sep 2023 20:36:04 +0800 Message-ID: <20230915123605.3732345-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915123605.3732345-1-ruanjinjie@huawei.com> References: <20230915123605.3732345-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Fri, 15 Sep 2023 05:37:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777107816174380120 X-GMAIL-MSGID: 1777107816174380120 Inject fault while probing btrfs.ko, if the first kzalloc() fails in __static_call_init(), key->mods will all no be initialized in this site and subsequent sites. And then in static_call_del_module() the site_mod->mod will cause wild-memory-access as below. To fix the issue, assign key->mods to NULL in __static_call_init() if it fails. On the other hand, if kzalloc fails, it will just return in init func. Even if static_call_key_sites(key) = true, the exit func will match the mod before the site_mod->next = NULL node is traversed. So just break if it the key->mods is NULL in exit func to avoid wild-memory-access in the subsequent site traversal. general protection fault, probably for non-canonical address 0xeb800159c89f94a0: 0000 [#1] PREEMPT SMP KASAN KASAN: maybe wild-memory-access in range [0x5c002ace44fca500-0x5c002ace44fca507] CPU: 2 PID: 1843 Comm: modprobe Tainted: G W N 6.6.0-rc1+ #60 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.13.0-1ubuntu1.1 04/01/2014 RIP: 0010:static_call_del_module+0x113/0x280 Code: 3c 20 00 0f 85 ef 00 00 00 49 8b 6e 08 48 85 ed 75 0d eb 75 48 85 db 74 70 49 89 ef 48 89 dd 48 8d 7d 08 48 89 f8 48 c1 e8 03 <42> 80 3c 20 00 75 78 48 89 e8 4c 8b 6d 08 48 c1 e8 03 42 80 3c 20 RSP: 0018:ffff888101d3f860 EFLAGS: 00010206 RAX: 0b800559c89f94a0 RBX: 5c002ace44fca4f8 RCX: ffffffffa0210f00 RDX: ffffffffa0210ed4 RSI: ffffffffa0210edc RDI: 5c002ace44fca500 RBP: 5c002ace44fca4f8 R08: 0000000000000000 R09: ffffed10233e4eea R10: ffffed10233e4ee9 R11: ffff888119f2774b R12: dffffc0000000000 R13: 80002ace3cfca4f8 R14: ffffffff85196de0 R15: ffffffff84ee9f99 FS: 00007f4ff6faa540(0000) GS:ffff888119f00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007ffc3d1f19e8 CR3: 0000000109fa6001 CR4: 0000000000170ee0 DR0: ffffffff8faefce8 DR1: ffffffff8faefce9 DR2: ffffffff8faefcea DR3: ffffffff8faefceb DR6: 00000000ffff0ff0 DR7: 0000000000000600 Call Trace: ? __die_body+0x1b/0x60 ? die_addr+0x43/0x70 ? exc_general_protection+0x121/0x210 ? asm_exc_general_protection+0x22/0x30 ? static_call_del_module+0x113/0x280 ? __SCT__tp_func_ipi_exit+0x8/0x8 static_call_module_notify+0x27f/0x390 ? rcu_segcblist_inc_len+0x17/0x20 notifier_call_chain+0xbf/0x280 notifier_call_chain_robust+0x7f/0xe0 ? notifier_call_chain+0x280/0x280 ? kasan_quarantine_put+0x46/0x160 blocking_notifier_call_chain_robust+0x5b/0x80 load_module+0x4d1d/0x69f0 ? module_frob_arch_sections+0x20/0x20 ? update_cfs_group+0x10c/0x2a0 ? __wake_up_common+0x10b/0x5d0 ? kernel_read_file+0x3ca/0x510 ? __x64_sys_fsconfig+0x650/0x650 ? __schedule+0xa0b/0x2a60 ? init_module_from_file+0xd2/0x130 init_module_from_file+0xd2/0x130 ? __ia32_sys_init_module+0xa0/0xa0 ? _raw_spin_lock_irqsave+0xe0/0xe0 ? ptrace_stop+0x487/0x790 idempotent_init_module+0x32d/0x6a0 ? init_module_from_file+0x130/0x130 ? __fget_light+0x57/0x500 __x64_sys_finit_module+0xbb/0x130 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Fixes: 9183c3f9ed71 ("static_call: Add inline static call infrastructure") Signed-off-by: Jinjie Ruan --- v2: - Update the fix tag. - Remove the redundant error information. - Update the commit message description. --- kernel/static_call_inline.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/static_call_inline.c b/kernel/static_call_inline.c index 639397b5491c..e7aa70d33530 100644 --- a/kernel/static_call_inline.c +++ b/kernel/static_call_inline.c @@ -256,8 +256,10 @@ static int __static_call_init(struct module *mod, } site_mod = kzalloc(sizeof(*site_mod), GFP_KERNEL); - if (!site_mod) + if (!site_mod) { + key->mods = NULL; return -ENOMEM; + } /* * When the key has a direct sites pointer, extract @@ -422,7 +424,7 @@ static void static_call_del_module(struct module *mod) ; if (!site_mod) - continue; + break; *prev = site_mod->next; kfree(site_mod);