From: Xie Yongji <xieyongji@bytedance.com>
To: christian.brauner@ubuntu.com, hch@infradead.org,
gregkh@linuxfoundation.org, arve@android.com, tkjos@android.com,
maco@android.com, joel@joelfernandes.org, hridya@google.com,
surenb@google.com, viro@zeniv.linux.org.uk, sargun@sargun.me,
keescook@chromium.org, jasowang@redhat.com
Cc: devel@driverdev.osuosl.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 2/2] binder: Use receive_fd() to receive file from another process
Date: Thu, 1 Apr 2021 17:09:32 +0800 [thread overview]
Message-ID: <20210401090932.121-3-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210401090932.121-1-xieyongji@bytedance.com>
Use receive_fd() to receive file from another process instead of
combination of get_unused_fd_flags() and fd_install(). This simplifies
the logic and also makes sure we don't miss any security stuff.
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
---
drivers/android/binder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index c119736ca56a..080bcab7d632 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -3728,7 +3728,7 @@ static int binder_apply_fd_fixups(struct binder_proc *proc,
int ret = 0;
list_for_each_entry(fixup, &t->fd_fixups, fixup_entry) {
- int fd = get_unused_fd_flags(O_CLOEXEC);
+ int fd = receive_fd(fixup->file, O_CLOEXEC);
if (fd < 0) {
binder_debug(BINDER_DEBUG_TRANSACTION,
@@ -3741,7 +3741,7 @@ static int binder_apply_fd_fixups(struct binder_proc *proc,
"fd fixup txn %d fd %d\n",
t->debug_id, fd);
trace_binder_transaction_fd_recv(t, fd, fixup->offset);
- fd_install(fd, fixup->file);
+ fput(fixup->file);
fixup->file = NULL;
if (binder_alloc_copy_to_buffer(&proc->alloc, t->buffer,
fixup->offset, &fd,
--
2.11.0
next prev parent reply other threads:[~2021-04-01 9:10 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 9:09 [PATCH 0/2] Export receive_fd() to modules and do some cleanups Xie Yongji
2021-04-01 9:09 ` [PATCH 1/2] file: Export receive_fd() to modules Xie Yongji
2021-04-01 9:52 ` Greg KH
2021-04-01 10:24 ` Yongji Xie
2021-04-01 9:09 ` Xie Yongji [this message]
2021-04-01 9:54 ` [PATCH 2/2] binder: Use receive_fd() to receive file from another process Greg KH
2021-04-01 10:12 ` Yongji Xie
2021-04-01 10:42 ` Greg KH
2021-04-01 11:29 ` Yongji Xie
2021-04-01 11:33 ` Greg KH
2021-04-01 12:28 ` Yongji Xie
2021-04-01 14:09 ` Greg KH
2021-04-02 9:12 ` Kees Cook
2021-04-01 10:40 ` Christian Brauner
2021-04-01 11:11 ` Yongji Xie
2021-04-16 5:19 ` Al Viro
2021-04-16 5:55 ` Al Viro
2021-04-16 13:42 ` Christian Brauner
2021-04-16 14:09 ` Al Viro
2021-04-16 15:13 ` Christian Brauner
2021-04-16 15:35 ` Al Viro
2021-04-16 15:58 ` Christian Brauner
2021-04-16 16:00 ` Christian Brauner
2021-04-16 17:00 ` Al Viro
2021-04-16 17:30 ` Al Viro
2021-04-17 1:30 ` Al Viro
2021-04-01 9:53 ` [PATCH 0/2] Export receive_fd() to modules and do some cleanups Greg KH
2021-04-01 10:00 ` Yongji Xie
2021-04-01 10:20 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210401090932.121-3-xieyongji@bytedance.com \
--to=xieyongji@bytedance.com \
--cc=arve@android.com \
--cc=christian.brauner@ubuntu.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=hch@infradead.org \
--cc=hridya@google.com \
--cc=jasowang@redhat.com \
--cc=joel@joelfernandes.org \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=maco@android.com \
--cc=sargun@sargun.me \
--cc=surenb@google.com \
--cc=tkjos@android.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).