[02/19] lirc: rc_dev_get_from_fd(): fix file leak

Message ID	20240607015957.2372428-2-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 4C7AE10799 for <linux-fsdevel@vger.kernel.org>; Fri, 7 Jun 2024 01:59:59 +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 02/19] lirc: rc_dev_get_from_fd(): fix file leak Date: Fri, 7 Jun 2024 02:59:40 +0100 Message-Id: <20240607015957.2372428-2-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-2-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 02/19] lirc: rc_dev_get_from_fd(): fix file leak
Date: Fri,  7 Jun 2024 02:59:40 +0100
Message-Id: <20240607015957.2372428-2-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

missing fdput() on a failure exit

Fixes: 6a9d552483d50 "media: rc: bpf attach/detach requires write permission" # v6.9
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 drivers/media/rc/lirc_dev.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

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

On Fri, Jun 07, 2024 at 02:59:40AM +0100, Al Viro wrote:
> missing fdput() on a failure exit
> 
> Fixes: 6a9d552483d50 "media: rc: bpf attach/detach requires write permission" # v6.9
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---

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

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 52aea4167718..717c441b4a86 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -828,8 +828,10 @@  struct rc_dev *rc_dev_get_from_fd(int fd, bool write)
 		return ERR_PTR(-EINVAL);
 	}
 
-	if (write && !(f.file->f_mode & FMODE_WRITE))
+	if (write && !(f.file->f_mode & FMODE_WRITE)) {
+		fdput(f);
 		return ERR_PTR(-EPERM);
+	}
 
 	fh = f.file->private_data;
 	dev = fh->rc;

[02/19] lirc: rc_dev_get_from_fd(): fix file leak

Commit Message

Comments

Patch