pidfd: Replace open-coded receive_fd()

Replace the open-coded version of receive_fd() with a call to the
new helper.

Thanks to Vamshi K Sthambamkadi <vamshi.k.sthambamkadi@gmail.com> for
catching a missed fput() in an earlier version of this patch.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Sargun Dhillon <sargun@sargun.me>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Kees Cook <keescook@chromium.org>

diff --git a/kernel/pid.c b/kernel/pid.c
index ee58530..da5aea5 100644 (file)
--- 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 {
-               __receive_sock(file);
-               fd_install(ret, file);
-       }
+       ret = receive_fd(file, O_CLOEXEC);
+       fput(file);
 
        return ret;
 }