[PATCH v7 6/9] pidfd: Replace open-coded receive_fd()
flat view
STALE2253d
REVIEWED: 2 (0M)
From: Kees Cook <hidden>
Date: 2020-07-09 18:27:33
Also in:
linux-fsdevel, linux-kselftest, lkml, netdev
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v7 of 4 in this series; 2 review trailers.
Revisions (4)
- v4 [diff vs current]
- v5 [diff vs current]
- v6 [diff vs current]
- v7 current
Replace the open-coded version of receive_fd() with a call to the new helper. Thanks to Vamshi K Sthambamkadi [off-list ref] for catching a missed fput() in an earlier version of this patch. Reviewed-by: Sargun Dhillon <redacted> Acked-by: Christian Brauner <redacted> Signed-off-by: Kees Cook <redacted> --- kernel/pid.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/kernel/pid.c b/kernel/pid.c
index 85ed00abdc7c..da5aea5f04fa 100644
--- a/kernel/pid.c
+++ b/kernel/pid.c@@ -636,19 +636,8 @@ static int pidfd_getfd(struct pid *pid, int fd) if (IS_ERR(file)) return PTR_ERR(file); - ret = security_file_receive(file); - if (ret) { - fput(file); - return ret; - } - - ret = get_unused_fd_flags(O_CLOEXEC); - if (ret < 0) { - fput(file); - } else { - fd_install(ret, file); - __receive_sock(file); - } + ret = receive_fd(file, O_CLOEXEC); + fput(file); return ret; }
--
2.25.1