diff options
| author | Patrick Tjin <pattjin@google.com> | 2016-08-09 10:45:10 -0700 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2016-08-09 10:45:10 -0700 |
| commit | 67595d352f8c00b20639d591944aee90b10e7179 (patch) | |
| tree | ab5dbd47beea6694f78311a3bcf3c8660758d16b | |
| parent | df57d4593246c0534afcd0f17b9792b64cd7c8d5 (diff) | |
| parent | f4693bedc8cd20b8a4e25900c39081906e637493 (diff) | |
Merge branch 'android-msm-hammerhead-3.4-mnc-mr1-security-next' into android-msm-hammerhead-3.4-mnc-mr1android-6.0.1_r0.124
| -rw-r--r-- | arch/arm/mach-msm/ipc_router.c | 4 | ||||
| -rw-r--r-- | drivers/staging/android/ashmem.c | 38 |
2 files changed, 20 insertions, 22 deletions
diff --git a/arch/arm/mach-msm/ipc_router.c b/arch/arm/mach-msm/ipc_router.c index be7f218a691c..15e18b7d89ca 100644 --- a/arch/arm/mach-msm/ipc_router.c +++ b/arch/arm/mach-msm/ipc_router.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -2492,7 +2492,7 @@ int msm_ipc_router_get_curr_pkt_size(struct msm_ipc_port *port_ptr) int msm_ipc_router_bind_control_port(struct msm_ipc_port *port_ptr) { - if (!port_ptr) + if (unlikely(!port_ptr || port_ptr->type != CLIENT_PORT)) return -EINVAL; down_write(&local_ports_lock_lha2); diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 4f13907543e3..740b5d215b59 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -785,11 +785,26 @@ static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return ret; } +static const struct file_operations ashmem_fops = { + .owner = THIS_MODULE, + .open = ashmem_open, + .release = ashmem_release, + .read = ashmem_read, + .llseek = ashmem_llseek, + .mmap = ashmem_mmap, + .unlocked_ioctl = ashmem_ioctl, + .compat_ioctl = ashmem_ioctl, +}; + +static struct miscdevice ashmem_misc = { + .minor = MISC_DYNAMIC_MINOR, + .name = "ashmem", + .fops = &ashmem_fops, +}; + static int is_ashmem_file(struct file *file) { - char fname[256], *name; - name = dentry_path(file->f_dentry, fname, 256); - return strcmp(name, "/ashmem") ? 0 : 1; + return (file->f_op == &ashmem_fops); } int get_ashmem_file(int fd, struct file **filp, struct file **vm_file, @@ -838,23 +853,6 @@ void put_ashmem_file(struct file *file) } EXPORT_SYMBOL(put_ashmem_file); -static const struct file_operations ashmem_fops = { - .owner = THIS_MODULE, - .open = ashmem_open, - .release = ashmem_release, - .read = ashmem_read, - .llseek = ashmem_llseek, - .mmap = ashmem_mmap, - .unlocked_ioctl = ashmem_ioctl, - .compat_ioctl = ashmem_ioctl, -}; - -static struct miscdevice ashmem_misc = { - .minor = MISC_DYNAMIC_MINOR, - .name = "ashmem", - .fops = &ashmem_fops, -}; - static int __init ashmem_init(void) { int ret; |