[16/19] do_mq_notify(): switch to CLASS(fd, ...)

Message ID	20240607015957.2372428-16-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 E73A44A39 for <linux-fsdevel@vger.kernel.org>; Fri, 7 Jun 2024 02:00:01 +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 16/19] do_mq_notify(): switch to CLASS(fd, ...) Date: Fri, 7 Jun 2024 02:59:54 +0100 Message-Id: <20240607015957.2372428-16-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-16-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 16/19] do_mq_notify(): switch to CLASS(fd, ...)
Date: Fri,  7 Jun 2024 02:59:54 +0100
Message-Id: <20240607015957.2372428-16-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

Commit Message

Al Viro June 7, 2024, 1:59 a.m. UTC

a minor twist is the reuse of struct fd instance in there

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 ipc/mqueue.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c72ef725e845..d798a43fe981 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1290,7 +1290,6 @@  SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes, char __user *, u_msg_ptr,
 static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
 {
 	int ret;
-	struct fd f;
 	struct sock *sock;
 	struct inode *inode;
 	struct mqueue_inode_info *info;
@@ -1328,13 +1327,14 @@  static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
 			skb_put(nc, NOTIFY_COOKIE_LEN);
 			/* and attach it to the socket */
 retry:
-			f = fdget(notification->sigev_signo);
-			if (!fd_file(f)) {
-				ret = -EBADF;
-				goto out;
+			{
+				CLASS(fd, f)(notification->sigev_signo);
+				if (fd_empty(f)) {
+					ret = -EBADF;
+					goto out;
+				}
+				sock = netlink_getsockbyfilp(fd_file(f));
 			}
-			sock = netlink_getsockbyfilp(fd_file(f));
-			fdput(f);
 			if (IS_ERR(sock)) {
 				ret = PTR_ERR(sock);
 				goto free_skb;
@@ -1351,8 +1351,8 @@  static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
 		}
 	}
 
-	f = fdget(mqdes);
-	if (!fd_file(f)) {
+	CLASS(fd, f)(mqdes);
+	if (fd_empty(f)) {
 		ret = -EBADF;
 		goto out;
 	}
@@ -1360,7 +1360,7 @@  static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
 	inode = file_inode(fd_file(f));
 	if (unlikely(fd_file(f)->f_op != &mqueue_file_operations)) {
 		ret = -EBADF;
-		goto out_fput;
+		goto out;
 	}
 	info = MQUEUE_I(inode);
 
@@ -1399,8 +1399,6 @@  static int do_mq_notify(mqd_t mqdes, const struct sigevent *notification)
 		inode_set_atime_to_ts(inode, inode_set_ctime_current(inode));
 	}
 	spin_unlock(&info->lock);
-out_fput:
-	fdput(f);
 out:
 	if (sock)
 		netlink_detachskb(sock, nc);

[16/19] do_mq_notify(): switch to CLASS(fd, ...)

Commit Message

Patch