Merge tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver updates from Greg KH:
 "Here is the "big" char and misc driver patches for 4.18-rc1.

  It's not a lot of stuff here, but there are some highlights:

   - coreboot driver updates

   - soundwire driver updates

   - android binder updates

   - fpga big sync, mostly documentation

   - lots of minor driver updates

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'char-misc-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (81 commits)
  vmw_balloon: fixing double free when batching mode is off
  MAINTAINERS: Add driver-api/fpga path
  fpga: clarify that unregister functions also free
  documentation: fpga: move fpga-region.txt to driver-api
  documentation: fpga: add bridge document to driver-api
  documentation: fpga: move fpga-mgr.txt to driver-api
  Documentation: fpga: move fpga overview to driver-api
  fpga: region: kernel-doc fixes
  fpga: bridge: kernel-doc fixes
  fpga: mgr: kernel-doc fixes
  fpga: use SPDX
  fpga: region: change api, add fpga_region_create/free
  fpga: bridge: change api, don't use drvdata
  fpga: manager: change api, don't use drvdata
  fpga: region: don't use drvdata in common fpga code
  Drivers: hv: vmbus: Removed an unnecessary cast from void *
  ver_linux: Drop redundant calls to system() to test if file is readable
  ver_linux: Move stderr redirection from function parameter to function body
  misc: IBM Virtual Management Channel Driver (VMC)
  rpmsg: Correct support for MODULE_DEVICE_TABLE()
  ...

3 files changed, 12 insertions, 26 deletions

diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index 7dce3795b887..ee4880bfdcdc 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -10,7 +10,7 @@ if ANDROID
 
 config ANDROID_BINDER_IPC
         bool "Android Binder IPC Driver"
-        depends on MMU
+        depends on MMU && !M68K
         default n
         ---help---
           Binder is used in Android for both communication between processes,
@@ -32,19 +32,6 @@ config ANDROID_BINDER_DEVICES
           created. Each binder device has its own context manager, and is
           therefore logically separated from the other devices.
 
-config ANDROID_BINDER_IPC_32BIT
-        bool "Use old (Android 4.4 and earlier) 32-bit binder API"
-        depends on !64BIT && ANDROID_BINDER_IPC
-        default y
-        ---help---
-          The Binder API has been changed to support both 32 and 64bit
-          applications in a mixed environment.
-
-          Enable this to support an old 32-bit Android user-space (v4.4 and
-          earlier).
-
-          Note that enabling this will break newer Android user-space.
-
 config ANDROID_BINDER_IPC_SELFTEST
         bool "Android Binder IPC Driver Selftest"
         depends on ANDROID_BINDER_IPC
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index e578eee31589..95283f3bb51c 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -72,10 +72,6 @@
 #include <linux/security.h>
 #include <linux/spinlock.h>
 
-#ifdef CONFIG_ANDROID_BINDER_IPC_32BIT
-#define BINDER_IPC_32BIT 1
-#endif
-
 #include <uapi/linux/android/binder.h>
 #include "binder_alloc.h"
 #include "binder_trace.h"
@@ -2058,8 +2054,8 @@ static size_t binder_validate_object(struct binder_buffer *buffer, u64 offset)
         struct binder_object_header *hdr;
         size_t object_size = 0;
 
-        if (offset > buffer->data_size - sizeof(*hdr) ||
-            buffer->data_size < sizeof(*hdr) ||
+        if (buffer->data_size < sizeof(*hdr) ||
+            offset > buffer->data_size - sizeof(*hdr) ||
             !IS_ALIGNED(offset, sizeof(u32)))
                 return 0;
 
@@ -3925,10 +3921,11 @@ retry:
                         binder_inner_proc_unlock(proc);
                         if (put_user(e->cmd, (uint32_t __user *)ptr))
                                 return -EFAULT;
+                        cmd = e->cmd;
                         e->cmd = BR_OK;
                         ptr += sizeof(uint32_t);
 
-                        binder_stat_br(proc, thread, e->cmd);
+                        binder_stat_br(proc, thread, cmd);
                 } break;
                 case BINDER_WORK_TRANSACTION_COMPLETE: {
                         binder_inner_proc_unlock(proc);
@@ -4696,7 +4693,7 @@ static void binder_vma_close(struct vm_area_struct *vma)
         binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
 }
 
-static int binder_vm_fault(struct vm_fault *vmf)
+static vm_fault_t binder_vm_fault(struct vm_fault *vmf)
 {
         return VM_FAULT_SIGBUS;
 }
@@ -4730,7 +4727,9 @@ static int binder_mmap(struct file *filp, struct vm_area_struct *vma)
                 failure_string = "bad vm_flags";
                 goto err_bad_arg;
         }
-        vma->vm_flags = (vma->vm_flags | VM_DONTCOPY) & ~VM_MAYWRITE;
+        vma->vm_flags |= VM_DONTCOPY | VM_MIXEDMAP;
+        vma->vm_flags &= ~VM_MAYWRITE;
+
         vma->vm_ops = &binder_vm_ops;
         vma->vm_private_data = proc;
 
diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index 5a426c877dfb..4f382d51def1 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -219,7 +219,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                 mm = alloc->vma_vm_mm;
 
         if (mm) {
-                down_write(&mm->mmap_sem);
+                down_read(&mm->mmap_sem);
                 vma = alloc->vma;
         }
 
@@ -288,7 +288,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                 /* vm_insert_page does not seem to increment the refcount */
         }
         if (mm) {
-                up_write(&mm->mmap_sem);
+                up_read(&mm->mmap_sem);
                 mmput(mm);
         }
         return 0;
@@ -321,7 +321,7 @@ err_page_ptr_cleared:
         }
 err_no_vma:
         if (mm) {
-                up_write(&mm->mmap_sem);
+                up_read(&mm->mmap_sem);
                 mmput(mm);
         }
         return vma ? -ENOMEM : -ESRCH;