[09/19] css_set_fork(): switch to CLASS(fd_raw, ...)

Message ID	20240607015957.2372428-9-viro@zeniv.linux.org.uk (mailing list archive)
State	New
Headers	show Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [62.89.141.173]) (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 AE86712B77 for <linux-fsdevel@vger.kernel.org>; Fri, 7 Jun 2024 02:00:00 +0000 (UTC) From: Al Viro <viro@zeniv.linux.org.uk> To: linux-fsdevel@vger.kernel.org Cc: brauner@kernel.org, torvalds@linux-foundation.org Subject: [PATCH 09/19] css_set_fork(): switch to CLASS(fd_raw, ...) Date: Fri, 7 Jun 2024 02:59:47 +0100 Message-Id: <20240607015957.2372428-9-viro@zeniv.linux.org.uk> In-Reply-To: <20240607015957.2372428-1-viro@zeniv.linux.org.uk> References: <20240607015656.GX1629371@ZenIV> <20240607015957.2372428-1-viro@zeniv.linux.org.uk> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Al Viro <viro@ftp.linux.org.uk>
Series	[01/19] powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() \| expand [01/19] powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() [02/19] lirc: rc_dev_get_from_fd(): fix file leak [03/19] introduce fd_file(), convert all accessors to it. [04/19] struct fd: representation change [05/19] add struct fd constructors, get rid of __to_fd() [06/19] net/socket.c: switch to CLASS(fd) [07/19] introduce struct fderr, convert overlayfs uses to that [08/19] fdget_raw() users: switch to CLASS(fd_raw, ...) [09/19] css_set_fork(): switch to CLASS(fd_raw, ...) [10/19] introduce "fd_pos" class [11/19] switch simple users of fdget() to CLASS(fd, ...) [12/19] bpf: switch to CLASS(fd, ...) [13/19] convert vmsplice() to CLASS(fd, ...) [14/19] finit_module(): convert to CLASS(fd, ...) [15/19] timerfd: switch to CLASS(fd, ...) [16/19] do_mq_notify(): switch to CLASS(fd, ...) [17/19] simplify xfs_find_handle() a bit [18/19] convert kernel/events/core.c [19/19] deal with the last remaing boolean uses of fd_file()

Message ID

20240607015957.2372428-9-viro@zeniv.linux.org.uk (mailing list archive)

State

New

Headers

From: Al Viro <viro@zeniv.linux.org.uk>
To: linux-fsdevel@vger.kernel.org
Cc: brauner@kernel.org,
	torvalds@linux-foundation.org
Subject: [PATCH 09/19] css_set_fork(): switch to CLASS(fd_raw, ...)
Date: Fri,  7 Jun 2024 02:59:47 +0100
Message-Id: <20240607015957.2372428-9-viro@zeniv.linux.org.uk>
In-Reply-To: <20240607015957.2372428-1-viro@zeniv.linux.org.uk>
References: <20240607015656.GX1629371@ZenIV>
 <20240607015957.2372428-1-viro@zeniv.linux.org.uk>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: Al Viro <viro@ftp.linux.org.uk>

Series

[01/19] powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap() | expand

reference acquired there by fget_raw() is not stashed anywhere - we could as well borrow instead. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- kernel/cgroup/cgroup.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Christian Brauner June 7, 2024, 3:21 p.m. UTC | #1

On Fri, Jun 07, 2024 at 02:59:47AM +0100, Al Viro wrote:
> reference acquired there by fget_raw() is not stashed anywhere -
> we could as well borrow instead.
> 
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---

Reviewed-by: Christian Brauner <brauner@kernel.org>

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index d53673ccaefc..b3a5ae2807b4 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -6394,7 +6394,6 @@  static int cgroup_css_set_fork(struct kernel_clone_args *kargs)
 	struct cgroup *dst_cgrp = NULL;
 	struct css_set *cset;
 	struct super_block *sb;
-	struct file *f;
 
 	if (kargs->flags & CLONE_INTO_CGROUP)
 		cgroup_lock();
@@ -6411,14 +6410,14 @@  static int cgroup_css_set_fork(struct kernel_clone_args *kargs)
 		return 0;
 	}
 
-	f = fget_raw(kargs->cgroup);
-	if (!f) {
+	CLASS(fd_raw, f)(kargs->cgroup);
+	if (fd_empty(f)) {
 		ret = -EBADF;
 		goto err;
 	}
-	sb = f->f_path.dentry->d_sb;
+	sb = fd_file(f)->f_path.dentry->d_sb;
 
-	dst_cgrp = cgroup_get_from_file(f);
+	dst_cgrp = cgroup_get_from_file(fd_file(f));
 	if (IS_ERR(dst_cgrp)) {
 		ret = PTR_ERR(dst_cgrp);
 		dst_cgrp = NULL;
@@ -6466,15 +6465,12 @@  static int cgroup_css_set_fork(struct kernel_clone_args *kargs)
 	}
 
 	put_css_set(cset);
-	fput(f);
 	kargs->cgrp = dst_cgrp;
 	return ret;
 
 err:
 	cgroup_threadgroup_change_end(current);
 	cgroup_unlock();
-	if (f)
-		fput(f);
 	if (dst_cgrp)
 		cgroup_put(dst_cgrp);
 	put_css_set(cset);

[09/19] css_set_fork(): switch to CLASS(fd_raw, ...)

Commit Message

Comments

Patch