From patchwork Wed Feb 15 13:28:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 57541 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp191821wrn; Wed, 15 Feb 2023 05:32:35 -0800 (PST) X-Google-Smtp-Source: AK7set8a/LL49zm2XNlKZca1f7ndR8w7jp0gZ0MLl/pxmPAQyzP9sKrno0c0wwEBU+y+TY3SLiKJ X-Received: by 2002:a62:65c1:0:b0:5a8:49c8:8533 with SMTP id z184-20020a6265c1000000b005a849c88533mr1827926pfb.8.1676467955092; Wed, 15 Feb 2023 05:32:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676467955; cv=none; d=google.com; s=arc-20160816; b=dSDtMekL832B8c+D7j7W6oH6wfDLl6zlDFkQKIlFiBLeoQGyWEuS/EVrxdqjRDFwqY eEHFjXCizPpsVazM/A+3dgKozdDaLc50Qc50PsCQpFNXaYNjn2B2l8g+Z6nOsxFZbucA jqOSiBK1zYZ9iTxJ2iDIssUZ95WX1xONF8TgJ0senB7TTUWncH+8dso6p3O+LBUqk8br Kl81S1i/7Hh+yLG8RHkf8mdiEuEMsIbzU7LEKST5gpANG4k91r2Nn9/utcA6Bv0IcdZ+ Z1lgrxeNBcKVA3HFEcFt2Jct2LcNSGfAVpPK657+fA9tEFPeCc0mWXd9CJidQ+bxs+WL RluQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=EWQ/4z9e+6vLV0glU9P3QUsFmtD750B4VPcS5ZG+jkU=; b=qyMIOhIT22Guv7AeQUMEsTO7jjr3ieb31xax98HQgDIVX/YsZGzbZQcjOSHHVeU1Z6 liN7paR95jnlXe8MinaVf9l6Q+zNaecja4BIZpBD+mB2C5BUsodoQa88Sq9JSeUQchVL cMIkn+KAm6Khs15SRxXMsUMKc//lhiTstH7WQX8dKKyuQo3iZIGiy38TUt5ZCrAOwMRg SjiOzyMpENZK11DIOoWa+yPu/U4ybXyzHo5xN9id7+7FsQPc4/aoRwyy44JFTbpds65u oPaBdyzYKrIkQVD77jK+X+skwbVTlQ6J1kO2ulgVcKQK4RTFJrYXqoYHN6OYVylvbbFG FCQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=stgaqlNV; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="VLt/BIOs"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g9-20020aa79dc9000000b0058bbe6710absi1414531pfq.261.2023.02.15.05.32.17; Wed, 15 Feb 2023 05:32:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=stgaqlNV; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="VLt/BIOs"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231343AbjBON3B (ORCPT + 99 others); Wed, 15 Feb 2023 08:29:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230192AbjBON24 (ORCPT ); Wed, 15 Feb 2023 08:28:56 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9448330F1; Wed, 15 Feb 2023 05:28:27 -0800 (PST) Date: Wed, 15 Feb 2023 13:28:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1676467704; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EWQ/4z9e+6vLV0glU9P3QUsFmtD750B4VPcS5ZG+jkU=; b=stgaqlNViyU03SFIMi37UKOy55XlEVnyF3km430kgAILYVclPeGU2kqv05VqDapalVJKe2 meWV2VzWf+rxMhhueFwg2xhUSLDqQVUYL59ZMgc+wn5LwGG4OnQUaL2AqExcuEdHkxwjU2 NshBfUXG9bUhzFt+waAu0mR2VEjSsNVn9nz3vhtSigG9N46SQGofadf6XhEwowI7AtD43K RNzCn2+ZQdc2PuDn7mNGhm8JvrGMqu1WK57ocoqL35HEAFXynXamG4iy+drRnU/oD9N0HD DcgL4tzvtFSzeD7scRDgvHzdOXnxgVIxb7jl6rwoz4kmAQEZE9GRWc5GSNScYg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1676467704; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EWQ/4z9e+6vLV0glU9P3QUsFmtD750B4VPcS5ZG+jkU=; b=VLt/BIOsVL21Q0R1UWj6NOUICuDk36LtwANuEffvolUbbeb59lpwROQiqC6gb49ZCbIVvf yjEfOSy/jEf6STBA== From: "tip-bot2 for Munehisa Kamata" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/urgent] sched/psi: Fix use-after-free in ep_remove_wait_queue() Cc: Munehisa Kamata , Mengchi Cheng , Ingo Molnar , Suren Baghdasaryan , Peter Zijlstra , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230214212705.4058045-1-kamatam@amazon.com> References: <20230214212705.4058045-1-kamatam@amazon.com> MIME-Version: 1.0 Message-ID: <167646770399.4906.4306273013254865682.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757904062263363839?= X-GMAIL-MSGID: =?utf-8?q?1757904062263363839?= The following commit has been merged into the sched/urgent branch of tip: Commit-ID: c2dbe32d5db5c4ead121cf86dabd5ab691fb47fe Gitweb: https://git.kernel.org/tip/c2dbe32d5db5c4ead121cf86dabd5ab691fb47fe Author: Munehisa Kamata AuthorDate: Tue, 14 Feb 2023 13:27:05 -08:00 Committer: Ingo Molnar CommitterDate: Wed, 15 Feb 2023 14:19:16 +01:00 sched/psi: Fix use-after-free in ep_remove_wait_queue() If a non-root cgroup gets removed when there is a thread that registered trigger and is polling on a pressure file within the cgroup, the polling waitqueue gets freed in the following path: do_rmdir cgroup_rmdir kernfs_drain_open_files cgroup_file_release cgroup_pressure_release psi_trigger_destroy However, the polling thread still has a reference to the pressure file and will access the freed waitqueue when the file is closed or upon exit: fput ep_eventpoll_release ep_free ep_remove_wait_queue remove_wait_queue This results in use-after-free as pasted below. The fundamental problem here is that cgroup_file_release() (and consequently waitqueue's lifetime) is not tied to the file's real lifetime. Using wake_up_pollfree() here might be less than ideal, but it is in line with the comment at commit 42288cb44c4b ("wait: add wake_up_pollfree()") since the waitqueue's lifetime is not tied to file's one and can be considered as another special case. While this would be fixable by somehow making cgroup_file_release() be tied to the fput(), it would require sizable refactoring at cgroups or higher layer which might be more justifiable if we identify more cases like this. BUG: KASAN: use-after-free in _raw_spin_lock_irqsave+0x60/0xc0 Write of size 4 at addr ffff88810e625328 by task a.out/4404 CPU: 19 PID: 4404 Comm: a.out Not tainted 6.2.0-rc6 #38 Hardware name: Amazon EC2 c5a.8xlarge/, BIOS 1.0 10/16/2017 Call Trace: dump_stack_lvl+0x73/0xa0 print_report+0x16c/0x4e0 kasan_report+0xc3/0xf0 kasan_check_range+0x2d2/0x310 _raw_spin_lock_irqsave+0x60/0xc0 remove_wait_queue+0x1a/0xa0 ep_free+0x12c/0x170 ep_eventpoll_release+0x26/0x30 __fput+0x202/0x400 task_work_run+0x11d/0x170 do_exit+0x495/0x1130 do_group_exit+0x100/0x100 get_signal+0xd67/0xde0 arch_do_signal_or_restart+0x2a/0x2b0 exit_to_user_mode_prepare+0x94/0x100 syscall_exit_to_user_mode+0x20/0x40 do_syscall_64+0x52/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd Allocated by task 4404: kasan_set_track+0x3d/0x60 __kasan_kmalloc+0x85/0x90 psi_trigger_create+0x113/0x3e0 pressure_write+0x146/0x2e0 cgroup_file_write+0x11c/0x250 kernfs_fop_write_iter+0x186/0x220 vfs_write+0x3d8/0x5c0 ksys_write+0x90/0x110 do_syscall_64+0x43/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd Freed by task 4407: kasan_set_track+0x3d/0x60 kasan_save_free_info+0x27/0x40 ____kasan_slab_free+0x11d/0x170 slab_free_freelist_hook+0x87/0x150 __kmem_cache_free+0xcb/0x180 psi_trigger_destroy+0x2e8/0x310 cgroup_file_release+0x4f/0xb0 kernfs_drain_open_files+0x165/0x1f0 kernfs_drain+0x162/0x1a0 __kernfs_remove+0x1fb/0x310 kernfs_remove_by_name_ns+0x95/0xe0 cgroup_addrm_files+0x67f/0x700 cgroup_destroy_locked+0x283/0x3c0 cgroup_rmdir+0x29/0x100 kernfs_iop_rmdir+0xd1/0x140 vfs_rmdir+0xfe/0x240 do_rmdir+0x13d/0x280 __x64_sys_rmdir+0x2c/0x30 do_syscall_64+0x43/0x90 entry_SYSCALL_64_after_hwframe+0x63/0xcd Fixes: 0e94682b73bf ("psi: introduce psi monitor") Signed-off-by: Munehisa Kamata Signed-off-by: Mengchi Cheng Signed-off-by: Ingo Molnar Acked-by: Suren Baghdasaryan Acked-by: Peter Zijlstra Cc: stable@vger.kernel.org Link: https://lore.kernel.org/lkml/20230106224859.4123476-1-kamatam@amazon.com/ Link: https://lore.kernel.org/r/20230214212705.4058045-1-kamatam@amazon.com --- kernel/sched/psi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 8ac8b81..02e011c 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -1343,10 +1343,11 @@ void psi_trigger_destroy(struct psi_trigger *t) group = t->group; /* - * Wakeup waiters to stop polling. Can happen if cgroup is deleted - * from under a polling process. + * Wakeup waiters to stop polling and clear the queue to prevent it from + * being accessed later. Can happen if cgroup is deleted from under a + * polling process. */ - wake_up_interruptible(&t->event_wait); + wake_up_pollfree(&t->event_wait); mutex_lock(&group->trigger_lock);