From patchwork Tue Feb 6 12:09:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 197409 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1500363dyb; Tue, 6 Feb 2024 04:25:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBfsbAsGy0s9sRp92PN3y0cGs/R+YlHUEIVWK1ypIErvQ60zjQJtYC30n8tPWpekeg7ODR X-Received: by 2002:a17:902:f7d5:b0:1d9:c86c:39c2 with SMTP id h21-20020a170902f7d500b001d9c86c39c2mr1081863plw.14.1707222332161; Tue, 06 Feb 2024 04:25:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707222332; cv=pass; d=google.com; s=arc-20160816; b=PKpep0J4Y1cZXwRgxHdvqz4fu3hqGAXkXLDvDyW7Wjq8/yyTRxpigM1nsLOc2qRGGH Ocn6MviHyHDHBmTwcP+geKvIChZzFyN8O7W7jn5RS443tB4UALKH2b1NQfs0j0eKs0Qf K8Sqe15jw7KYgxTolbKUfuX6qv9OnfQUCkx5sqPfrMyl2Q6wKgyJqtUCfkmABfzD0UOa jpHwZ1V2sXIuXAvCH6JBNlgk3J1/nlcgD5Ozg98+xm4PFECpg0rAZQ364i6+f8aSqxAK J+2mau7GI6Z0pLmBV41UuueyrGQvXHrN7sFB+ky5MNW27xEkRFyKx7p45UycI+Nua3Qb BVMg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=w/iPhJOudMj5zSlscWJCTndr2nhDIzagNWRmI9xY/Ss=; fh=SAGMp9qhPbl/eKj5fgp15NeoqCCufxnE+1kfLt3JFRE=; b=UmJoItM6coL+SDCMnGnfQYaMsbWmFR61qoXXcoSjQRgihih12eYbakcXr6O4gacxdt RYITRNhjoOzl2qGuX+URHQZ8s+Fv/SBCejMRr5Vou+al03Wjidz/tUkUqgdfkcZOr+Xs +a0sFdqa1fUnIkKHbI40MODrtHNeJZx91D8W4fieVnJYWSG3S0srXjtJLRrC5tXhN1g+ OL4PJY5iJUDCaEXF52rAuWHYR4ePvBqSG7G83p8IxKOoxRt3rM+CtwiOCYHfpCrBP5Gw mcIevNpkw7DhdqOnsErYgnEavdJ+e6WfpbUPRC0tphL5bwbmgaegFsgw2pU4432TiSlo QKxQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-54913-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54913-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCVhSMGw0RL3VAGXorFUq2MrP5NYkhjv7tUda6HUWRIo1QXp/wBe4UYSebRLu4nAmmybb8hicHUfjFH6189D0YyPUaDckQ== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id jg11-20020a17090326cb00b001d4af344a66si1538119plb.141.2024.02.06.04.25.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 04:25:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-54913-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-54913-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-54913-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 81ED628356A for ; Tue, 6 Feb 2024 12:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9832B14F9C2; Tue, 6 Feb 2024 12:09:37 +0000 (UTC) Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A07B913A882; Tue, 6 Feb 2024 12:09:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221364; cv=none; b=MMtmGvLXWZv7gN+Bbp8avCHvZc+CPwes2NoLve1ChHpuFC3ee4a8CzgiVjzj0UCui9WpIJmozntqNIPloy3vo+9RxOTXgvgKgOrJ8qaE7U1xSQV3+nkO2aXDnCGNDpCS6ITnpEhGBkmgPqNVHi8jsBU8C+eP35/Foa0AQ5Iykek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707221364; c=relaxed/simple; bh=3jDSxRh6ezDXpMpe9bCVmX2ZEPsqcyYEs+U1X03bFjY=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=R+ycmMDvT8JqB4bgU0co7QBLiBH+/z7dfLgtU0REVkCuKEZ4mdehb5vS8/Q1WDVjRZWxl0/UecclwRXWnYigYjSPCejTqYqWXSFGTimWB10W9V9UY7VxmX9x+SaYAAUZZxfOJXnMl9cxJYS7VhS+OdsmKJvXgE1Ylb67JuT3lq4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41BCDC43399; Tue, 6 Feb 2024 12:09:24 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rXKGu-00000006bKL-2wSM; Tue, 06 Feb 2024 07:09:52 -0500 Message-ID: <20240206120952.562520394@rostedt.homelinux.com> User-Agent: quilt/0.67 Date: Tue, 06 Feb 2024 07:09:43 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , Sasha Levin , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Al Viro , Christian Brauner Subject: [v6.6][PATCH 38/57] eventfs: Have eventfs_iterate() stop immediately if ei->is_freed is set References: <20240206120905.570408983@rostedt.homelinux.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790152364408441067 X-GMAIL-MSGID: 1790152364408441067 From: "Steven Rostedt (Google)" If ei->is_freed is set in eventfs_iterate(), it means that the directory that is being iterated on is in the process of being freed. Just exit the loop immediately when that is ever detected, and separate out the return of the entry->callback() from ei->is_freed. Link: https://lore.kernel.org/linux-trace-kernel/20240104220048.016261289@goodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Linus Torvalds Cc: Al Viro Cc: Christian Brauner Cc: Greg Kroah-Hartman Signed-off-by: Steven Rostedt (Google) (cherry picked from commit e109deadb73318cf4a3bd61287d969f705df278f) --- fs/tracefs/event_inode.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 72912b5f9a90..0aca6910efb3 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -788,11 +788,12 @@ static int eventfs_iterate(struct file *file, struct dir_context *ctx) name = entry->name; mutex_lock(&eventfs_mutex); - /* If ei->is_freed, then the event itself may be too */ - if (!ei->is_freed) - r = entry->callback(name, &mode, &cdata, &fops); - else - r = -1; + /* If ei->is_freed then just bail here, nothing more to do */ + if (ei->is_freed) { + mutex_unlock(&eventfs_mutex); + goto out; + } + r = entry->callback(name, &mode, &cdata, &fops); mutex_unlock(&eventfs_mutex); if (r <= 0) continue;