From: Chen Feng <puck.chen@hisilicon.com>
To: <gregkh@linuxfoundation.org>, <arve@android.com>,
<riandrews@android.com>, <devel@driverdev.osuosl.org>,
<linux-kernel@vger.kernel.org>, <wangjing6@huawei.com>,
<weidong2@hisilicon.com>, <zhaojunmin@huawei.com>,
<puck.chen@hisilicon.com>
Cc: <suzhuangluan@hisilicon.com>, <puck.chen@foxmail.com>,
<w.f@huawei.com>, <linuxarm@huawei.com>
Subject: [PATCH v3] android: binder: Sanity check at binder ioctl
Date: Mon, 1 Feb 2016 14:04:02 +0800 [thread overview]
Message-ID: <1454306642-73580-1-git-send-email-puck.chen@hisilicon.com> (raw)
Sanity check at binder ioctl function,
Only allow the shared mm_struct to use the same binder-object
to do binder operate.
And add proc->vma_vm_mm = current->mm at the open function.
The libbinder do ioctl before mmap called.
V2: Fix compile error for error commit
V3: Change the condition to proc->vma_vm_mm
Signed-off-by: Chen Feng <puck.chen@hisilicon.com>
Signed-off-by: Wei Dong <weidong2@hisilicon.com>
Signed-off-by: Junmin Zhao <zhaojunmin@huawei.com>
Reviewed-by: Zhuangluan Su <suzhuangluan@hisilicon.com>
---
drivers/android/binder.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index a39e85f..f080a8b 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2737,6 +2737,10 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
/*pr_info("binder_ioctl: %d:%d %x %lx\n",
proc->pid, current->pid, cmd, arg);*/
+ if (unlikely(current->mm != proc->vma_vm_mm)) {
+ pr_err("current mm mismatch proc mm\n");
+ return -EINVAL;
+ }
trace_binder_ioctl(cmd, arg);
ret = wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2);
@@ -2951,6 +2955,7 @@ static int binder_open(struct inode *nodp, struct file *filp)
return -ENOMEM;
get_task_struct(current);
proc->tsk = current;
+ proc->vma_vm_mm = current->mm;
INIT_LIST_HEAD(&proc->todo);
init_waitqueue_head(&proc->wait);
proc->default_priority = task_nice(current);
--
1.9.1
next reply other threads:[~2016-02-01 6:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 6:04 Chen Feng [this message]
2016-02-02 12:36 ` Chen Feng
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=1454306642-73580-1-git-send-email-puck.chen@hisilicon.com \
--to=puck.chen@hisilicon.com \
--cc=arve@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=puck.chen@foxmail.com \
--cc=riandrews@android.com \
--cc=suzhuangluan@hisilicon.com \
--cc=w.f@huawei.com \
--cc=wangjing6@huawei.com \
--cc=weidong2@hisilicon.com \
--cc=zhaojunmin@huawei.com \
/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
all inboxes | Powered by JetHome®