Skip to content

Commit f24ea09

Browse files
bertschingertgregkh
authored andcommitted
fhandle: do_handle_open() should get FD with user flags
[ Upstream commit b5ca889 ] In f07c7cc, do_handle_open() was switched to use the automatic cleanup method for getting a FD. In that change it was also switched to pass O_CLOEXEC unconditionally to get_unused_fd_flags() instead of passing the user-specified flags. I don't see anything in that commit description that indicates this was intentional, so I am assuming it was an oversight. With this fix, the FD will again be opened with, or without, O_CLOEXEC according to what the user requested. Fixes: f07c7cc ("fhandle: simplify error handling") Signed-off-by: Thomas Bertschinger <tahbertschinger@gmail.com> Link: https://lore.kernel.org/20250814235431.995876-4-tahbertschinger@gmail.com Reviewed-by: Amir Goldstein <amir73il@gmail.com> Signed-off-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 580dc52 commit f24ea09

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/fhandle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ static long do_handle_open(int mountdirfd, struct file_handle __user *ufh,
404404
if (retval)
405405
return retval;
406406

407-
CLASS(get_unused_fd, fd)(O_CLOEXEC);
407+
CLASS(get_unused_fd, fd)(open_flag);
408408
if (fd < 0)
409409
return fd;
410410

0 commit comments

Comments
 (0)